| commit | cc328deac5a5f576aa79d87cfacf01e370e5e03e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Aug 29 01:44:24 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Aug 29 01:44:24 2013 -0400 |
| tree | 871b1944559e851356928350229aeafca26a166f | |
| parent | 80b17be70b63646cb141bf1826afe32281e561ec [diff] | |
| parent | c6eaa3f067d6f9fa55fd9645e93ed79411bebdaf [diff] |
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>