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/802 | |
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/802')
-rw-r--r-- | net/802/fc.c | 21 | ||||
-rw-r--r-- | net/802/fddi.c | 26 | ||||
-rw-r--r-- | net/802/hippi.c | 28 |
3 files changed, 0 insertions, 75 deletions
diff --git a/net/802/fc.c b/net/802/fc.c index 7c174b6750cd..7b9219022418 100644 --- a/net/802/fc.c +++ b/net/802/fc.c | |||
@@ -75,29 +75,8 @@ static int fc_header(struct sk_buff *skb, struct net_device *dev, | |||
75 | return -hdr_len; | 75 | return -hdr_len; |
76 | } | 76 | } |
77 | 77 | ||
78 | /* | ||
79 | * A neighbour discovery of some species (eg arp) has completed. We | ||
80 | * can now send the packet. | ||
81 | */ | ||
82 | |||
83 | static int fc_rebuild_header(struct sk_buff *skb) | ||
84 | { | ||
85 | #ifdef CONFIG_INET | ||
86 | struct fch_hdr *fch=(struct fch_hdr *)skb->data; | ||
87 | struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr)); | ||
88 | if(fcllc->ethertype != htons(ETH_P_IP)) { | ||
89 | printk("fc_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(fcllc->ethertype)); | ||
90 | return 0; | ||
91 | } | ||
92 | return arp_find(fch->daddr, skb); | ||
93 | #else | ||
94 | return 0; | ||
95 | #endif | ||
96 | } | ||
97 | |||
98 | static const struct header_ops fc_header_ops = { | 78 | static const struct header_ops fc_header_ops = { |
99 | .create = fc_header, | 79 | .create = fc_header, |
100 | .rebuild = fc_rebuild_header, | ||
101 | }; | 80 | }; |
102 | 81 | ||
103 | static void fc_setup(struct net_device *dev) | 82 | static void fc_setup(struct net_device *dev) |
diff --git a/net/802/fddi.c b/net/802/fddi.c index 59e7346f1193..7d3a0af954e8 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c | |||
@@ -87,31 +87,6 @@ static int fddi_header(struct sk_buff *skb, struct net_device *dev, | |||
87 | return -hl; | 87 | return -hl; |
88 | } | 88 | } |
89 | 89 | ||
90 | |||
91 | /* | ||
92 | * Rebuild the FDDI MAC header. This is called after an ARP | ||
93 | * (or in future other address resolution) has completed on | ||
94 | * this sk_buff. We now let ARP fill in the other fields. | ||
95 | */ | ||
96 | |||
97 | static int fddi_rebuild_header(struct sk_buff *skb) | ||
98 | { | ||
99 | struct fddihdr *fddi = (struct fddihdr *)skb->data; | ||
100 | |||
101 | #ifdef CONFIG_INET | ||
102 | if (fddi->hdr.llc_snap.ethertype == htons(ETH_P_IP)) | ||
103 | /* Try to get ARP to resolve the header and fill destination address */ | ||
104 | return arp_find(fddi->daddr, skb); | ||
105 | else | ||
106 | #endif | ||
107 | { | ||
108 | printk("%s: Don't know how to resolve type %04X addresses.\n", | ||
109 | skb->dev->name, ntohs(fddi->hdr.llc_snap.ethertype)); | ||
110 | return 0; | ||
111 | } | ||
112 | } | ||
113 | |||
114 | |||
115 | /* | 90 | /* |
116 | * Determine the packet's protocol ID and fill in skb fields. | 91 | * Determine the packet's protocol ID and fill in skb fields. |
117 | * This routine is called before an incoming packet is passed | 92 | * This routine is called before an incoming packet is passed |
@@ -177,7 +152,6 @@ EXPORT_SYMBOL(fddi_change_mtu); | |||
177 | 152 | ||
178 | static const struct header_ops fddi_header_ops = { | 153 | static const struct header_ops fddi_header_ops = { |
179 | .create = fddi_header, | 154 | .create = fddi_header, |
180 | .rebuild = fddi_rebuild_header, | ||
181 | }; | 155 | }; |
182 | 156 | ||
183 | 157 | ||
diff --git a/net/802/hippi.c b/net/802/hippi.c index 2e03f8259dd5..ade1a52cdcff 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c | |||
@@ -91,33 +91,6 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev, | |||
91 | 91 | ||
92 | 92 | ||
93 | /* | 93 | /* |
94 | * Rebuild the HIPPI MAC header. This is called after an ARP has | ||
95 | * completed on this sk_buff. We now let ARP fill in the other fields. | ||
96 | */ | ||
97 | |||
98 | static int hippi_rebuild_header(struct sk_buff *skb) | ||
99 | { | ||
100 | struct hippi_hdr *hip = (struct hippi_hdr *)skb->data; | ||
101 | |||
102 | /* | ||
103 | * Only IP is currently supported | ||
104 | */ | ||
105 | |||
106 | if(hip->snap.ethertype != htons(ETH_P_IP)) | ||
107 | { | ||
108 | printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype)); | ||
109 | return 0; | ||
110 | } | ||
111 | |||
112 | /* | ||
113 | * We don't support dynamic ARP on HIPPI, but we use the ARP | ||
114 | * static ARP tables to hold the I-FIELDs. | ||
115 | */ | ||
116 | return arp_find(hip->le.daddr, skb); | ||
117 | } | ||
118 | |||
119 | |||
120 | /* | ||
121 | * Determine the packet's protocol ID. | 94 | * Determine the packet's protocol ID. |
122 | */ | 95 | */ |
123 | 96 | ||
@@ -186,7 +159,6 @@ EXPORT_SYMBOL(hippi_neigh_setup_dev); | |||
186 | 159 | ||
187 | static const struct header_ops hippi_header_ops = { | 160 | static const struct header_ops hippi_header_ops = { |
188 | .create = hippi_header, | 161 | .create = hippi_header, |
189 | .rebuild = hippi_rebuild_header, | ||
190 | }; | 162 | }; |
191 | 163 | ||
192 | 164 | ||