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>

diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index 1f99a1d..d642539 100644 (file)
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -12,7 +12,6 @@ struct sock;
 
 struct dst_ops {
        unsigned short          family;
-       __be16                  protocol;
        unsigned int            gc_thresh;
 
        int                     (*gc)(struct dst_ops *ops);

diff --git a/net/bridge/br_nf_core.c b/net/bridge/br_nf_core.c
index 387cb3b..20cbb72 100644 (file)
--- a/net/bridge/br_nf_core.c
+++ b/net/bridge/br_nf_core.c
@@ -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,

diff --cc net/decnet/dn_route.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/xfrm4_policy.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/ipv6/xfrm6_policy.c
Simple merge