diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 07:41:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 07:41:56 -0700 |
commit | cd97824994042b809493807ea644ba26c0c23290 (patch) | |
tree | 705d9d069130330d4d9d2a23cd9ff99ec8187f28 /include/net/udp.h | |
parent | 3307f19f634dfb134b370c59a778fdb2d574c17b (diff) | |
parent | 3664090e199f10cb0282097faae8f8ca58c1e4ae (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: (64 commits)
phylib: Fix delay argument of schedule_delayed_work
NET/ixgbe: Fix powering off during shutdown
NET/e1000e: Fix powering off during shutdown
NET/e1000: Fix powering off during shutdown
packet: avoid warnings when high-order page allocation fails
gianfar: stop send queue before resetting gianfar
myr10ge: again fix lro_gen_skb() alignment
declance: convert to net_device_ops
bfin_mac: convert to net_device_ops
au1000: convert to net_device_ops
atarilance: convert to net_device_ops
a2065: convert to net_device_ops
ixgbe: update real_num_tx_queues on changing num_rx_queues
ixgbe: fix tx queue index
Revert "rose: zero length frame filtering in af_rose.c"
sfc: Use correct macro to set event bitfield
sfc: Match calls to netif_napi_add() and netif_napi_del()
bonding: Remove debug printk
e1000/e1000: fix compile warning
ehea: Fix incomplete conversion to net_device_ops
...
Diffstat (limited to 'include/net/udp.h')
-rw-r--r-- | include/net/udp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index 93dbe294d45..90e6ce56be6 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -124,8 +124,6 @@ static inline void udp_lib_close(struct sock *sk, long timeout) sk_common_release(sk); } -extern int ipv4_rcv_saddr_equal(const struct sock *sk1, - const struct sock *sk2); extern int udp_lib_get_port(struct sock *sk, unsigned short snum, int (*)(const struct sock*,const struct sock*)); |