aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2009-02-01 03:45:17 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-01 03:45:17 -0500
commit09640e6365c679b5642b1c41b6d7078f51689ddf (patch)
treea2b80c153bd23fe59db8c6994fda29923819fcea /drivers/net/bonding
parentee437770c42088b9b653e8b3bf28a61fa647f84e (diff)
net: replace uses of __constant_{endian}
Base versions handle constant folding now. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_3ad.h2
-rw-r--r--drivers/net/bonding/bond_alb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 8a83eb283c21..a306230381c8 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -29,7 +29,7 @@
29 29
30// General definitions 30// General definitions
31#define BOND_ETH_P_LACPDU 0x8809 31#define BOND_ETH_P_LACPDU 0x8809
32#define PKT_TYPE_LACPDU __constant_htons(BOND_ETH_P_LACPDU) 32#define PKT_TYPE_LACPDU cpu_to_be16(BOND_ETH_P_LACPDU)
33#define AD_TIMER_INTERVAL 100 /*msec*/ 33#define AD_TIMER_INTERVAL 100 /*msec*/
34 34
35#define MULTICAST_LACPDU_ADDR {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02} 35#define MULTICAST_LACPDU_ADDR {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02}
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 27fb7f5c21cf..409b14074275 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -822,7 +822,7 @@ static int rlb_initialize(struct bonding *bond)
822 _unlock_rx_hashtbl(bond); 822 _unlock_rx_hashtbl(bond);
823 823
824 /*initialize packet type*/ 824 /*initialize packet type*/
825 pk_type->type = __constant_htons(ETH_P_ARP); 825 pk_type->type = cpu_to_be16(ETH_P_ARP);
826 pk_type->dev = NULL; 826 pk_type->dev = NULL;
827 pk_type->func = rlb_arp_recv; 827 pk_type->func = rlb_arp_recv;
828 828
@@ -892,7 +892,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
892 memset(&pkt, 0, size); 892 memset(&pkt, 0, size);
893 memcpy(pkt.mac_dst, mac_addr, ETH_ALEN); 893 memcpy(pkt.mac_dst, mac_addr, ETH_ALEN);
894 memcpy(pkt.mac_src, mac_addr, ETH_ALEN); 894 memcpy(pkt.mac_src, mac_addr, ETH_ALEN);
895 pkt.type = __constant_htons(ETH_P_LOOP); 895 pkt.type = cpu_to_be16(ETH_P_LOOP);
896 896
897 for (i = 0; i < MAX_LP_BURST; i++) { 897 for (i = 0; i < MAX_LP_BURST; i++) {
898 struct sk_buff *skb; 898 struct sk_buff *skb;