diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
| commit | 743c5bb898be45009770c144e5e14e4f448e56b9 (patch) | |
| tree | 40fff57c975f89da4a90922c165595840e99093a /net/ipv4/ip_input.c | |
| parent | 8fe120b5a665fc869c23f86e4964b801f6e53486 (diff) | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
Conflicts:
sound/soc/omap/Kconfig
Diffstat (limited to 'net/ipv4/ip_input.c')
| -rw-r--r-- | net/ipv4/ip_input.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 3da817b89e9..15e3e683ade 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -190,10 +190,7 @@ static int ip_local_deliver_finish(struct sk_buff *skb) { struct net *net = dev_net(skb->dev); - __skb_pull(skb, ip_hdrlen(skb)); - - /* Point into the IP datagram, just past the header. */ - skb_reset_transport_header(skb); + __skb_pull(skb, skb_network_header_len(skb)); rcu_read_lock(); { @@ -437,6 +434,8 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, goto drop; } + skb->transport_header = skb->network_header + iph->ihl*4; + /* Remove any debris in the socket control block */ memset(IPCB(skb), 0, sizeof(struct inet_skb_parm)); |