mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-14 16:23:51 +08:00
net: Remove protocol from struct dst_ops
After my change to neigh_hh_init to obtain the protocol from the neigh_table there are no more users of protocol in struct dst_ops. Remove the protocol field from dst_ops and all of it's initializers. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
13259db53f
commit
ddb3b6033c
@ -12,7 +12,6 @@ struct sock;
|
||||
|
||||
struct dst_ops {
|
||||
unsigned short family;
|
||||
__be16 protocol;
|
||||
unsigned int gc_thresh;
|
||||
|
||||
int (*gc)(struct dst_ops *ops);
|
||||
|
@ -54,7 +54,6 @@ static unsigned int fake_mtu(const struct dst_entry *dst)
|
||||
|
||||
static struct dst_ops fake_dst_ops = {
|
||||
.family = AF_INET,
|
||||
.protocol = cpu_to_be16(ETH_P_IP),
|
||||
.update_pmtu = fake_update_pmtu,
|
||||
.redirect = fake_redirect,
|
||||
.cow_metrics = fake_cow_metrics,
|
||||
|
@ -136,7 +136,6 @@ int decnet_dst_gc_interval = 2;
|
||||
|
||||
static struct dst_ops dn_dst_ops = {
|
||||
.family = PF_DECnet,
|
||||
.protocol = cpu_to_be16(ETH_P_DNA_RT),
|
||||
.gc_thresh = 128,
|
||||
.gc = dn_dst_gc,
|
||||
.check = dn_dst_check,
|
||||
|
@ -152,7 +152,6 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
|
||||
|
||||
static struct dst_ops ipv4_dst_ops = {
|
||||
.family = AF_INET,
|
||||
.protocol = cpu_to_be16(ETH_P_IP),
|
||||
.check = ipv4_dst_check,
|
||||
.default_advmss = ipv4_default_advmss,
|
||||
.mtu = ipv4_mtu,
|
||||
@ -2225,7 +2224,6 @@ static u32 *ipv4_rt_blackhole_cow_metrics(struct dst_entry *dst,
|
||||
|
||||
static struct dst_ops ipv4_dst_blackhole_ops = {
|
||||
.family = AF_INET,
|
||||
.protocol = cpu_to_be16(ETH_P_IP),
|
||||
.check = ipv4_blackhole_dst_check,
|
||||
.mtu = ipv4_blackhole_mtu,
|
||||
.default_advmss = ipv4_default_advmss,
|
||||
|
@ -232,7 +232,6 @@ static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
|
||||
|
||||
static struct dst_ops xfrm4_dst_ops = {
|
||||
.family = AF_INET,
|
||||
.protocol = cpu_to_be16(ETH_P_IP),
|
||||
.gc = xfrm4_garbage_collect,
|
||||
.update_pmtu = xfrm4_update_pmtu,
|
||||
.redirect = xfrm4_redirect,
|
||||
|
@ -194,7 +194,6 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst,
|
||||
|
||||
static struct dst_ops ip6_dst_ops_template = {
|
||||
.family = AF_INET6,
|
||||
.protocol = cpu_to_be16(ETH_P_IPV6),
|
||||
.gc = ip6_dst_gc,
|
||||
.gc_thresh = 1024,
|
||||
.check = ip6_dst_check,
|
||||
@ -236,7 +235,6 @@ static u32 *ip6_rt_blackhole_cow_metrics(struct dst_entry *dst,
|
||||
|
||||
static struct dst_ops ip6_dst_blackhole_ops = {
|
||||
.family = AF_INET6,
|
||||
.protocol = cpu_to_be16(ETH_P_IPV6),
|
||||
.destroy = ip6_dst_destroy,
|
||||
.check = ip6_dst_check,
|
||||
.mtu = ip6_blackhole_mtu,
|
||||
|
@ -292,7 +292,6 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
|
||||
|
||||
static struct dst_ops xfrm6_dst_ops = {
|
||||
.family = AF_INET6,
|
||||
.protocol = cpu_to_be16(ETH_P_IPV6),
|
||||
.gc = xfrm6_garbage_collect,
|
||||
.update_pmtu = xfrm6_update_pmtu,
|
||||
.redirect = xfrm6_redirect,
|
||||
|
Loading…
Reference in New Issue
Block a user