openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arp: make arp_hdr_len() return unsigned int 

Negative ARP header length are not a thing.

Constify arguments while I'm at it.

Space savings:

	add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-3 (-3)
	function                        old     new   delta
	arpt_do_table                  1163    1160      -3

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan 2017-09-26 23:12:28 +03:00 committed by David S. Miller
parent bbdc9e687f
commit 6ade97da60
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/bonding/bond_main.c
View File

@ -2491,7 +2491,8 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
struct slave *curr_active_slave, *curr_arp_slave; struct slave *curr_active_slave, *curr_arp_slave;
unsigned char *arp_ptr; unsigned char *arp_ptr;
__be32 sip, tip; __be32 sip, tip;
int alen, is_arp = skb->protocol == __cpu_to_be16(ETH_P_ARP); int is_arp = skb->protocol == __cpu_to_be16(ETH_P_ARP);
unsigned int alen;
if (!slave_do_arp_validate(bond, slave)) { if (!slave_do_arp_validate(bond, slave)) {
if ((slave_do_arp_validate_only(bond) && is_arp) || if ((slave_do_arp_validate_only(bond) && is_arp) ||

2
include/linux/if_arp.h
View File

@ -31,7 +31,7 @@ static inline struct arphdr *arp_hdr(const struct sk_buff *skb)
return (struct arphdr *)skb_network_header(skb); return (struct arphdr *)skb_network_header(skb);
} }
static inline int arp_hdr_len(struct net_device *dev) static inline unsigned int arp_hdr_len(const struct net_device *dev)
{ {
switch (dev->type) { switch (dev->type) {
#if IS_ENABLED(CONFIG_FIREWIRE_NET) #if IS_ENABLED(CONFIG_FIREWIRE_NET)