diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
| commit | 27eb2c4b3d3e13f376a359e293c212a2e9407af5 (patch) | |
| tree | 556aa7b5cd6eeb4214dec129c789515157187010 /include/linux/if_arp.h | |
| parent | 5705b8aca5a80141de5637ff0e23b31b26f2c5bf (diff) | |
| parent | 67bf12ca50d524f9e225347fe63533562e2004de (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.11 merge window.
Diffstat (limited to 'include/linux/if_arp.h')
| -rw-r--r-- | include/linux/if_arp.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 89b4614a4722..f563907ed776 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h | |||
| @@ -33,7 +33,15 @@ static inline struct arphdr *arp_hdr(const struct sk_buff *skb) | |||
| 33 | 33 | ||
| 34 | static inline int arp_hdr_len(struct net_device *dev) | 34 | static inline int arp_hdr_len(struct net_device *dev) |
| 35 | { | 35 | { |
| 36 | /* ARP header, plus 2 device addresses, plus 2 IP addresses. */ | 36 | switch (dev->type) { |
| 37 | return sizeof(struct arphdr) + (dev->addr_len + sizeof(u32)) * 2; | 37 | #if IS_ENABLED(CONFIG_FIREWIRE_NET) |
| 38 | case ARPHRD_IEEE1394: | ||
| 39 | /* ARP header, device address and 2 IP addresses */ | ||
| 40 | return sizeof(struct arphdr) + dev->addr_len + sizeof(u32) * 2; | ||
| 41 | #endif | ||
| 42 | default: | ||
| 43 | /* ARP header, plus 2 device addresses, plus 2 IP addresses. */ | ||
| 44 | return sizeof(struct arphdr) + (dev->addr_len + sizeof(u32)) * 2; | ||
| 45 | } | ||
| 38 | } | 46 | } |
| 39 | #endif /* _LINUX_IF_ARP_H */ | 47 | #endif /* _LINUX_IF_ARP_H */ |