diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 07:52:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 07:52:21 -0800 |
| commit | 25431e900dc47abb312c9ae8599e8c8ae038eb5a (patch) | |
| tree | 3d67ac01e65668d673bfee18cfeb0ed8bc0027fa /net | |
| parent | 0d7a063fa7b918d2a61cdd63232286d4131774de (diff) | |
| parent | 55128bc23e9ab44e97f81f6cd349035230ee59a6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sunrpc: fix rdma dependencies
e1000: Fix PCI enable to honor the need_ioport flag
sgi-xp: link XPNET's net_device_ops to its net_device structure
pcnet_cs: Fix misuse of the equality operator.
hso: add new device id's
dca: redesign locks to fix deadlocks
cassini/sungem: limit reaches -1, but 0 tested
net: variables reach -1, but 0 tested
qlge: bugfix: Add missing netif_napi_del call.
qlge: bugfix: Add flash offset for second port.
qlge: bugfix: Fix endian issue when reading flash.
udp: increments sk_drops in __udp_queue_rcv_skb()
net: Fix userland breakage wrt. linux/if_tunnel.h
net: packet socket packet_lookup_frame fix
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/udp.c | 4 | ||||
| -rw-r--r-- | net/packet/af_packet.c | 8 | ||||
| -rw-r--r-- | net/sunrpc/Kconfig | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index b7faffe5c02..1ab180bad72 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1015,9 +1015,11 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) if ((rc = sock_queue_rcv_skb(sk, skb)) < 0) { /* Note that an ENOMEM error is charged twice */ - if (rc == -ENOMEM) + if (rc == -ENOMEM) { UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, is_udplite); + atomic_inc(&sk->sk_drops); + } goto drop; } diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 9454d4ae46d..1fc4a7885c4 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -222,13 +222,13 @@ static void *packet_lookup_frame(struct packet_sock *po, unsigned int position, h.raw = po->pg_vec[pg_vec_pos] + (frame_offset * po->frame_size); switch (po->tp_version) { case TPACKET_V1: - if (status != h.h1->tp_status ? TP_STATUS_USER : - TP_STATUS_KERNEL) + if (status != (h.h1->tp_status ? TP_STATUS_USER : + TP_STATUS_KERNEL)) return NULL; break; case TPACKET_V2: - if (status != h.h2->tp_status ? TP_STATUS_USER : - TP_STATUS_KERNEL) + if (status != (h.h2->tp_status ? TP_STATUS_USER : + TP_STATUS_KERNEL)) return NULL; break; } diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig index dcef600d0bf..5592883e1e4 100644 --- a/net/sunrpc/Kconfig +++ b/net/sunrpc/Kconfig @@ -6,7 +6,7 @@ config SUNRPC_GSS config SUNRPC_XPRT_RDMA tristate - depends on SUNRPC && INFINIBAND && EXPERIMENTAL + depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS && EXPERIMENTAL default SUNRPC && INFINIBAND help This option allows the NFS client and server to support |