diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-17 05:21:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-17 05:21:24 +0200 |
| commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
| tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /net/ipv4 | |
| parent | gianfar: remove unused DECLARE_MAC_BUF (diff) | |
| parent | cdc-eem: bad crc checking (diff) | |
| download | linux-da8120355e80ddaf534adb8ed910871d97512d56.tar.xz linux-da8120355e80ddaf534adb8ed910871d97512d56.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_gre.c | 4 | ||||
| -rw-r--r-- | net/ipv4/ip_output.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index cd85ebc119a5..b902ef55be7f 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -735,10 +735,10 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) } tos = tiph->tos; - if (tos&1) { + if (tos == 1) { + tos = 0; if (skb->protocol == htons(ETH_P_IP)) tos = old_iph->tos; - tos &= ~1; } { diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 247026282669..7d0821054729 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1243,7 +1243,6 @@ int ip_push_pending_frames(struct sock *sk) skb->len += tmp_skb->len; skb->data_len += tmp_skb->len; skb->truesize += tmp_skb->truesize; - __sock_put(tmp_skb->sk); tmp_skb->destructor = NULL; tmp_skb->sk = NULL; } |