Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net' restricting a HW workaround alongside cleanups in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -107,10 +107,16 @@ struct dst_entry {
|
||||
};
|
||||
};
|
||||
|
||||
struct dst_metrics {
|
||||
u32 metrics[RTAX_MAX];
|
||||
atomic_t refcnt;
|
||||
};
|
||||
extern const struct dst_metrics dst_default_metrics;
|
||||
|
||||
u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
|
||||
extern const u32 dst_default_metrics[];
|
||||
|
||||
#define DST_METRICS_READ_ONLY 0x1UL
|
||||
#define DST_METRICS_REFCOUNTED 0x2UL
|
||||
#define DST_METRICS_FLAGS 0x3UL
|
||||
#define __DST_METRICS_PTR(Y) \
|
||||
((u32 *)((Y) & ~DST_METRICS_FLAGS))
|
||||
|
Reference in New Issue
Block a user