mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
45593c2bd2d1e257d03d795f9c80e22e18f188f0
linux/net
History
David S. Miller 45593c2bd2 Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge 
Included changes:
- substitute FSF address with URL
- deselect current bat-GW when GW-client mode gets deactivated
- send every DHCP packet using bat-unicast messages when GW-client mode is
  enabled
- implement the Extended Isolation mechanism (it is an enhancement of the
  already existing batman-AP-isolation). This mechanism allows the user to drop
  packets exchanged by selected clients by using netfilter marks.
- fix typ0 in header guard
- minor code cleanups

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-10 17:59:34 -05:00
..
9p
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2013-11-15 13:28:47 +09:00
802
neigh: convert parms to an array
2013-12-09 20:56:12 -05:00
8021q
vlan: Fix header ops passthru when doing TX VLAN offload.
2013-12-31 16:23:35 -05:00
appletalk
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
atm
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
ax25
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
batman-adv
batman-adv: set the isolation mark in the skb if needed
2014-01-08 20:49:46 +01:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2014-01-10 10:59:40 -05:00
bridge
netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain()
2014-01-09 20:17:16 +01:00
caif
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
can
can: gw: remove obsolete checks
2013-12-21 14:56:21 +01:00
ceph
net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
core
net-gre-gro: Add GRE support to the GRO stack
2014-01-07 16:21:31 -05:00
dcb
net/*: Fix FSF address in file headers
2013-12-06 12:37:57 -05:00
dccp
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-06 17:37:45 -05:00
decnet
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-12-19 18:37:49 -05:00
dns_resolver
net/*: Fix FSF address in file headers
2013-12-06 12:37:57 -05:00
dsa
…
ethernet
ethernet: use likely() for common Ethernet encap
2013-09-30 21:52:53 -07:00
hsr
net/hsr: using kfree_rcu() to simplify the code
2013-12-17 16:32:30 -05:00
ieee802154
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2014-01-10 10:59:40 -05:00
ipv4
tcp: metrics: Allow selective get/del of tcp-metrics based on src IP
2014-01-10 17:38:18 -05:00
ipv6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2014-01-10 10:59:40 -05:00
ipx
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
irda
net/irda: Fix FSF address in file headers
2013-12-06 12:37:57 -05:00
iucv
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
key
xfrm: export verify_userspi_info for pkfey and netlink interface
2013-12-16 12:54:02 +01:00
l2tp
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-12-19 18:37:49 -05:00
lapb
net/lapb: re-send packets on timeout
2013-09-23 16:52:45 -04:00
llc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-06 17:37:45 -05:00
mac80211
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2014-01-10 10:59:40 -05:00
mac802154
mac802154: fix following checkpath.pl warning Prefer pr_warn(... to pr_warning(...
2013-12-22 18:53:08 -05:00
mpls
ipip: add GSO/TSO support
2013-10-19 19:36:19 -04:00
netfilter
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2014-01-10 14:50:02 -05:00
netlabel
netlabel: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
netlink
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
2014-01-06 19:48:38 -05:00
netrom
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
nfc
nfc: Fix FSF address in file headers
2013-12-11 10:56:21 -05:00
openvswitch
openvswitch: Use kmem_cache_free() instead of kfree()
2014-01-09 14:26:39 -05:00
packet
packet: fix "foo * bar" and "(foo*)" problems
2013-12-31 13:38:41 -05:00
phonet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-11-19 15:50:47 -08:00
rds
rds: prevent dereference of a NULL device
2013-12-27 12:33:58 -05:00
rfkill
rfkill: Fix FSF address in file headers
2013-12-11 10:56:21 -05:00
rose
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-06 17:37:45 -05:00
rxrpc
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
sched
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-06 17:37:45 -05:00
sctp
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-06 17:37:45 -05:00
sunrpc
Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
2013-12-05 13:05:48 -08:00
tipc
tipc: make link start event synchronous
2014-01-07 18:44:26 -05:00
unix
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-12-18 16:42:06 -05:00
vmw_vsock
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
wimax
wimax: remove dead code
2013-11-21 13:09:42 -05:00
wireless
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-06 17:37:45 -05:00
x25
x25: convert printks to pr_<level>
2013-12-09 20:24:18 -05:00
xfrm
net: xfrm: xfrm_policy: silence compiler warning
2014-01-07 22:45:26 -05:00
compat.c
net: clamp ->msg_namelen instead of returning an error
2013-11-29 16:12:52 -05:00
Kconfig
net: netprio: rename config to be more consistent with cgroup configs
2014-01-03 23:41:42 +01:00
Makefile
net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)
2013-11-03 23:20:14 -05:00
nonet.c
…
socket.c
net: handle error more gracefully in socketpair()
2013-12-10 22:24:13 -05:00
sysctl_net.c
net: Update the sysctl permissions handler to test effective uid/gid
2013-10-07 15:57:56 -04:00