aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-03-09 14:14:37 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-09 16:06:10 -0400
commitddb3b6033ca68d71a5f0611b58b2642729342245 (patch)
tree73f04d0f75a1ee417b80a7c3dd4b2f76096b1d09 /net/ipv6
parent13259db53ff42c9033d749e01e7d6d3c4859dfd9 (diff)
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/route.c2
-rw-r--r--net/ipv6/xfrm6_policy.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 4688bd4d7f59..06fa819c43c9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -194,7 +194,6 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst,
194 194
195static struct dst_ops ip6_dst_ops_template = { 195static struct dst_ops ip6_dst_ops_template = {
196 .family = AF_INET6, 196 .family = AF_INET6,
197 .protocol = cpu_to_be16(ETH_P_IPV6),
198 .gc = ip6_dst_gc, 197 .gc = ip6_dst_gc,
199 .gc_thresh = 1024, 198 .gc_thresh = 1024,
200 .check = ip6_dst_check, 199 .check = ip6_dst_check,
@@ -236,7 +235,6 @@ static u32 *ip6_rt_blackhole_cow_metrics(struct dst_entry *dst,
236 235
237static struct dst_ops ip6_dst_blackhole_ops = { 236static struct dst_ops ip6_dst_blackhole_ops = {
238 .family = AF_INET6, 237 .family = AF_INET6,
239 .protocol = cpu_to_be16(ETH_P_IPV6),
240 .destroy = ip6_dst_destroy, 238 .destroy = ip6_dst_destroy,
241 .check = ip6_dst_check, 239 .check = ip6_dst_check,
242 .mtu = ip6_blackhole_mtu, 240 .mtu = ip6_blackhole_mtu,
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 48bf5a06847b..8ddf2b545151 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -292,7 +292,6 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
292 292
293static struct dst_ops xfrm6_dst_ops = { 293static struct dst_ops xfrm6_dst_ops = {
294 .family = AF_INET6, 294 .family = AF_INET6,
295 .protocol = cpu_to_be16(ETH_P_IPV6),
296 .gc = xfrm6_garbage_collect, 295 .gc = xfrm6_garbage_collect,
297 .update_pmtu = xfrm6_update_pmtu, 296 .update_pmtu = xfrm6_update_pmtu,
298 .redirect = xfrm6_redirect, 297 .redirect = xfrm6_redirect,