aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/hamradio/6pack.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index daca0dee88f3..2533933c79dc 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -284,18 +284,6 @@ static int sp_close(struct net_device *dev)
284 return 0; 284 return 0;
285} 285}
286 286
287/* Return the frame type ID */
288static int sp_header(struct sk_buff *skb, struct net_device *dev,
289 unsigned short type, const void *daddr,
290 const void *saddr, unsigned len)
291{
292#ifdef CONFIG_INET
293 if (type != ETH_P_AX25)
294 return ax25_hard_header(skb, dev, type, daddr, saddr, len);
295#endif
296 return 0;
297}
298
299static int sp_set_mac_address(struct net_device *dev, void *addr) 287static int sp_set_mac_address(struct net_device *dev, void *addr)
300{ 288{
301 struct sockaddr_ax25 *sa = addr; 289 struct sockaddr_ax25 *sa = addr;
@@ -309,20 +297,6 @@ static int sp_set_mac_address(struct net_device *dev, void *addr)
309 return 0; 297 return 0;
310} 298}
311 299
312static int sp_rebuild_header(struct sk_buff *skb)
313{
314#ifdef CONFIG_INET
315 return ax25_rebuild_header(skb);
316#else
317 return 0;
318#endif
319}
320
321static const struct header_ops sp_header_ops = {
322 .create = sp_header,
323 .rebuild = sp_rebuild_header,
324};
325
326static const struct net_device_ops sp_netdev_ops = { 300static const struct net_device_ops sp_netdev_ops = {
327 .ndo_open = sp_open_dev, 301 .ndo_open = sp_open_dev,
328 .ndo_stop = sp_close, 302 .ndo_stop = sp_close,
@@ -337,7 +311,7 @@ static void sp_setup(struct net_device *dev)
337 dev->destructor = free_netdev; 311 dev->destructor = free_netdev;
338 dev->mtu = SIXP_MTU; 312 dev->mtu = SIXP_MTU;
339 dev->hard_header_len = AX25_MAX_HEADER_LEN; 313 dev->hard_header_len = AX25_MAX_HEADER_LEN;
340 dev->header_ops = &sp_header_ops; 314 dev->header_ops = &ax25_header_ops;
341 315
342 dev->addr_len = AX25_ADDR_LEN; 316 dev->addr_len = AX25_ADDR_LEN;
343 dev->type = ARPHRD_AX25; 317 dev->type = ARPHRD_AX25;