diff options
| author | David S. Miller | 2014-01-10 23:59:34 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-10 23:59:34 +0100 |
| commit | 45593c2bd2d1e257d03d795f9c80e22e18f188f0 (patch) | |
| tree | 244bc6742cec283d828642adbec3e882e925a425 /drivers/net/can | |
| parent | Merge branch 'tcp_metrics_saddr' (diff) | |
| parent | batman-adv: set the isolation mark in the skb if needed (diff) | |
| download | kernel-qcow2-linux-45593c2bd2d1e257d03d795f9c80e22e18f188f0.tar.gz kernel-qcow2-linux-45593c2bd2d1e257d03d795f9c80e22e18f188f0.tar.xz kernel-qcow2-linux-45593c2bd2d1e257d03d795f9c80e22e18f188f0.zip | |
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>
Diffstat (limited to 'drivers/net/can')
0 files changed, 0 insertions, 0 deletions