diff --git a/[refs] b/[refs] index 26888a078c3b..1b457c2c98f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9add4d8174907c9977ad29cf6e71460829ec954e +refs/heads/master: ecd5cf5dc5b07bc57aedf4c92453d6c343e3d840 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 6a2c34e6d962..a2a0bdb95a8f 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -643,7 +643,7 @@ extern unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, extern void __skb_get_rxhash(struct sk_buff *skb); static inline __u32 skb_get_rxhash(struct sk_buff *skb) { - if (!skb->rxhash) + if (!skb->l4_rxhash) __skb_get_rxhash(skb); return skb->rxhash;