diff options
author | David S. Miller <davem@davemloft.net> | 2013-08-29 01:44:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-29 01:44:24 -0400 |
commit | cc328deac5a5f576aa79d87cfacf01e370e5e03e (patch) | |
tree | 871b1944559e851356928350229aeafca26a166f /drivers | |
parent | qlcnic: underflow in qlcnic_validate_max_tx_rings() (diff) | |
parent | batman-adv: send GW_DEL event when the gw client mode is deselected (diff) | |
download | linux-dev-cc328deac5a5f576aa79d87cfacf01e370e5e03e.tar.xz linux-dev-cc328deac5a5f576aa79d87cfacf01e370e5e03e.zip |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- set the protocol field in the skb structure according to the encapsulated
payload
- make the gateway component send a uevent in case of "gw client mode"
de-selection
- increment version number
- minor code rearrangement
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions