Commit f14c4e4e authored by Brian Haley's avatar Brian Haley Committed by Jeff Garzik
Browse files

bonding: change some __constant_htons() to htons() 



Resending since I didn't see any responses from the first try.

Change __constant_htons() to htons() in the bonding driver, it should
only be used for initializers.

-Brian

Signed-off-by: default avatarBrian Haley <brian.haley@hp.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent a816f75a

drivers/net/bonding/bond_alb.c

+2 −2
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) 
	struct arp_pkt *arp = arp_pkt(skb);

	struct slave *tx_slave = NULL;



	if (arp->op_code == __constant_htons(ARPOP_REPLY)) {

	if (arp->op_code == htons(ARPOP_REPLY)) {

		/* the arp must be sent on the selected

		* rx channel

		*/
@@ -719,7 +719,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) 
			memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN);

		}

		dprintk("Server sent ARP Reply packet\n");

	} else if (arp->op_code == __constant_htons(ARPOP_REQUEST)) {

	} else if (arp->op_code == htons(ARPOP_REQUEST)) {

		/* Create an entry in the rx_hashtbl for this client as a

		 * place holder.

		 * When the arp reply is received the entry will be updated

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -3702,7 +3702,7 @@ static int bond_xmit_hash_policy_l23(struct sk_buff *skb, 
	struct ethhdr *data = (struct ethhdr *)skb->data;

	struct iphdr *iph = ip_hdr(skb);



	if (skb->protocol == __constant_htons(ETH_P_IP)) {

	if (skb->protocol == htons(ETH_P_IP)) {

		return ((ntohl(iph->saddr ^ iph->daddr) & 0xffff) ^

			(data->h_dest[5] ^ bond_dev->dev_addr[5])) % count;

	}
@@ -3723,8 +3723,8 @@ static int bond_xmit_hash_policy_l34(struct sk_buff *skb, 
	__be16 *layer4hdr = (__be16 *)((u32 *)iph + iph->ihl);

	int layer4_xor = 0;



	if (skb->protocol == __constant_htons(ETH_P_IP)) {

		if (!(iph->frag_off & __constant_htons(IP_MF|IP_OFFSET)) &&

	if (skb->protocol == htons(ETH_P_IP)) {

		if (!(iph->frag_off & htons(IP_MF|IP_OFFSET)) &&

		    (iph->protocol == IPPROTO_TCP ||

		     iph->protocol == IPPROTO_UDP)) {

			layer4_xor = ntohs((*layer4hdr ^ *(layer4hdr + 1)));

CRA Git | Maintained and supported by SUSTech CRA and CCSE