diff --git a/[refs] b/[refs] index b493e0cf8f0c..e935cb3d548d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06aebfb7faa13258af5230ff3d1587ece6c0250e +refs/heads/master: fff642570dc47ab76491fe81ee6599269c4eb13e diff --git a/trunk/net/ipx/af_ipx.c b/trunk/net/ipx/af_ipx.c index 401964204866..bef3f61569f7 100644 --- a/trunk/net/ipx/af_ipx.c +++ b/trunk/net/ipx/af_ipx.c @@ -1645,7 +1645,7 @@ static int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty if (!pskb_may_pull(skb, sizeof(struct ipxhdr))) goto drop; - ipx_pktsize = ntohs(ipxhdr(skb)->ipx_pktsize); + ipx_pktsize = ntohs(ipx_hdr(skb)->ipx_pktsize); /* Too small or invalid header? */ if (ipx_pktsize < sizeof(struct ipxhdr) ||