Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (448 commits)
  [IPV4] nl_fib_lookup: Initialise res.r before fib_res_put(&res)
  [IPV6]: Fix thinko in ipv6_rthdr_rcv() changes.
  [IPV4]: Add multipath cached to feature-removal-schedule.txt
  [WIRELESS] cfg80211: Clarify locking comment.
  [WIRELESS] cfg80211: Fix locking in wiphy_new.
  [WEXT] net_device: Don't include wext bits if not required.
  [WEXT]: Misc code cleanups.
  [WEXT]: Reduce inline abuse.
  [WEXT]: Move EXPORT_SYMBOL statements where they belong.
  [WEXT]: Cleanup early ioctl call path.
  [WEXT]: Remove options.
  [WEXT]: Remove dead debug code.
  [WEXT]: Clean up how wext is called.
  [WEXT]: Move to net/wireless
  [AFS]: Eliminate cmpxchg() usage in vlocation code.
  [RXRPC]: Fix pointers passed to bitops.
  [RXRPC]: Remove bogus atomic_* overrides.
  [AFS]: Fix u64 printing in debug logging.
  [AFS]: Add "directory write" support.
  [AFS]: Implement the CB.InitCallBackState3 operation.
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index 10117c8503e8..de8399a79774 100644
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -114,13 +114,13 @@ static inline int INET_ECN_set_ce(struct sk_buff *skb)
 {
         switch (skb->protocol) {
         case __constant_htons(ETH_P_IP):
-                if (skb->nh.raw + sizeof(struct iphdr) <= skb->tail)
-                        return IP_ECN_set_ce(skb->nh.iph);
+                if (skb->network_header + sizeof(struct iphdr) <= skb->tail)
+                        return IP_ECN_set_ce(ip_hdr(skb));
                 break;
 
         case __constant_htons(ETH_P_IPV6):
-                if (skb->nh.raw + sizeof(struct ipv6hdr) <= skb->tail)
-                        return IP6_ECN_set_ce(skb->nh.ipv6h);
+                if (skb->network_header + sizeof(struct ipv6hdr) <= skb->tail)
+                        return IP6_ECN_set_ce(ipv6_hdr(skb));
                 break;
         }