diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-02 01:11:09 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 16:43:41 -0500 |
commit | d476059e77d1af48453a58f9de1e36f2eaff6450 (patch) | |
tree | ac24382189ef5639d155b9f4872d937d50fb8cba /net/netrom | |
parent | 945db424bfbcb7b72a92702a487dc0000cd1efed (diff) |
net: Kill dev_rebuild_header
Now that there are no more users kill dev_rebuild_header and all of it's
implementations.
This is long overdue.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom')
-rw-r--r-- | net/netrom/nr_dev.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 6ae063cebf7d..988f542481a8 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
@@ -65,36 +65,6 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) | |||
65 | return 1; | 65 | return 1; |
66 | } | 66 | } |
67 | 67 | ||
68 | #ifdef CONFIG_INET | ||
69 | |||
70 | static int nr_rebuild_header(struct sk_buff *skb) | ||
71 | { | ||
72 | unsigned char *bp = skb->data; | ||
73 | |||
74 | if (arp_find(bp + 7, skb)) | ||
75 | return 1; | ||
76 | |||
77 | bp[6] &= ~AX25_CBIT; | ||
78 | bp[6] &= ~AX25_EBIT; | ||
79 | bp[6] |= AX25_SSSID_SPARE; | ||
80 | bp += AX25_ADDR_LEN; | ||
81 | |||
82 | bp[6] &= ~AX25_CBIT; | ||
83 | bp[6] |= AX25_EBIT; | ||
84 | bp[6] |= AX25_SSSID_SPARE; | ||
85 | |||
86 | return 0; | ||
87 | } | ||
88 | |||
89 | #else | ||
90 | |||
91 | static int nr_rebuild_header(struct sk_buff *skb) | ||
92 | { | ||
93 | return 1; | ||
94 | } | ||
95 | |||
96 | #endif | ||
97 | |||
98 | static int nr_header(struct sk_buff *skb, struct net_device *dev, | 68 | static int nr_header(struct sk_buff *skb, struct net_device *dev, |
99 | unsigned short type, | 69 | unsigned short type, |
100 | const void *daddr, const void *saddr, unsigned int len) | 70 | const void *daddr, const void *saddr, unsigned int len) |
@@ -188,7 +158,6 @@ static netdev_tx_t nr_xmit(struct sk_buff *skb, struct net_device *dev) | |||
188 | 158 | ||
189 | static const struct header_ops nr_header_ops = { | 159 | static const struct header_ops nr_header_ops = { |
190 | .create = nr_header, | 160 | .create = nr_header, |
191 | .rebuild= nr_rebuild_header, | ||
192 | }; | 161 | }; |
193 | 162 | ||
194 | static const struct net_device_ops nr_netdev_ops = { | 163 | static const struct net_device_ops nr_netdev_ops = { |