Skip to contentSkip to conversation

Fix ipx_hdr compile error

PATCH In review Amir Noam 2 participants 2 messages Sep 11, 2003 – Sep 20, 2003

Subsystems (3)
lore
Share & tools
lore

Amir Noam

author
#0 lore raw

PATCH 10/10 Fix ipx_hdr compile error

drivers/net/bonding/bond_alb.c +2 -4
diff -Nuarp a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
@@ -1329,16 +1329,15 @@ bond_alb_xmit(struct sk_buff *skb, struc
 		hash_size = 16;
 		break;
 
-#ifdef FIXME
 	case ETH_P_IPX:
-		if (skb->nh.ipxh->ipx_checksum !=
+		if (ipx_hdr(skb)->ipx_checksum !=
 		    __constant_htons(IPX_NO_CHECKSUM)) {
 			/* something is wrong with this packet */
 			do_tx_balance = 0;
 			break;
 		}
 
-		if (skb->nh.ipxh->ipx_type !=
+		if (ipx_hdr(skb)->ipx_type !=
 		    __constant_htons(IPX_TYPE_NCP)) {
 			/* The only protocol worth balancing in
 			 * this family since it has an "ARP" like
@@ -1351,7 +1350,6 @@ bond_alb_xmit(struct sk_buff *skb, struc
 		hash_start = (char*)eth_data->h_dest;
 		hash_size = ETH_ALEN;
 		break;
-#endif
 
 	case ETH_P_ARP:
 		do_tx_balance = 0;
#1 lore raw

All patches in this series applied except patch2.

patch2 looks OK, but did not apply cleanly. I suspect that Shmulik Hen's forward somehow garbled the patch.

Please resend patch2 (again).

Jeff