Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (107 commits)
  smc911x: fix compilation breakage wjen debug is on
  [netdrvr] eexpress: minor corrections
  add NAPI support to sb1250-mac.c
  ixgb: ROUND_UP macro cleanup in drivers/net/ixgb
  e1000: ROUND_UP macro cleanup in drivers/net/e1000
  Generic HDLC sparse annotations
  e100: Optionally use I/O mode only to access register space
  e100: allow bad MAC address when running with invalid eeprom csum
  ehea: fix for dlpar support
  ehea: fix for sysfs entries
  3C509: Remove unnecessary include of <linux/pm_legacy.h>
  NetXen: Fix for vmalloc issues
  NetXen: Fixes for Power PC architecture
  NetXen: Port swap feature for multi port cards
  NetXen: Removal of redundant macros
  NetXen: Multi PCI support for Quad cards
  NetXen: Removal of redundant argument passing
  NetXen: Use multiple PCI functions
  [netdrvr e100] experiment with doing RX in a similar manner to eepro100
  [PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index aeb2789adf26..15b6e07a4382 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -288,31 +288,31 @@ static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)
         struct sk_buff *skb = *skb_p;
 
         switch (skb->protocol) {
-        case __constant_ntohs(NLPID_CCITT_ANSI_LMI):
+        case __constant_htons(NLPID_CCITT_ANSI_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_CCITT_ANSI_LMI;
                 break;
 
-        case __constant_ntohs(NLPID_CISCO_LMI):
+        case __constant_htons(NLPID_CISCO_LMI):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_CISCO_LMI;
                 break;
 
-        case __constant_ntohs(ETH_P_IP):
+        case __constant_htons(ETH_P_IP):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_IP;
                 break;
 
-        case __constant_ntohs(ETH_P_IPV6):
+        case __constant_htons(ETH_P_IPV6):
                 head_len = 4;
                 skb_push(skb, head_len);
                 skb->data[3] = NLPID_IPV6;
                 break;
 
-        case __constant_ntohs(ETH_P_802_3):
+        case __constant_htons(ETH_P_802_3):
                 head_len = 10;
                 if (skb_headroom(skb) < head_len) {
                         struct sk_buff *skb2 = skb_realloc_headroom(skb,
@@ -340,7 +340,7 @@ static int fr_hard_header(struct sk_buff **skb_p, u16 dlci)
                 skb->data[5] = FR_PAD;
                 skb->data[6] = FR_PAD;
                 skb->data[7] = FR_PAD;
-                *(u16*)(skb->data + 8) = skb->protocol;
+                *(__be16*)(skb->data + 8) = skb->protocol;
         }
 
         dlci_to_q922(skb->data, dlci);
@@ -974,8 +974,8 @@ static int fr_rx(struct sk_buff *skb)
 
         } else if (skb->len > 10 && data[3] == FR_PAD &&
                    data[4] == NLPID_SNAP && data[5] == FR_PAD) {
-                u16 oui = ntohs(*(u16*)(data + 6));
-                u16 pid = ntohs(*(u16*)(data + 8));
+                u16 oui = ntohs(*(__be16*)(data + 6));
+                u16 pid = ntohs(*(__be16*)(data + 8));
                 skb_pull(skb, 10);
 
                 switch ((((u32)oui) << 16) | pid) {
@@ -1127,7 +1127,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
                 memcpy(dev->dev_addr, "\x00\x01", 2);
                 get_random_bytes(dev->dev_addr + 2, ETH_ALEN - 2);
         } else {
-                *(u16*)dev->dev_addr = htons(dlci);
+                *(__be16*)dev->dev_addr = htons(dlci);
                 dlci_to_q922(dev->broadcast, dlci);
         }
         dev->hard_start_xmit = pvc_xmit;