diff options
| author | David S. Miller <[email protected]> | 2017-01-30 00:21:26 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2017-01-30 00:21:26 +0000 |
| commit | 936f459bea07868723b057ece43d321446c82f0a (patch) | |
| tree | 45b3174a471b105139d56fc7f6814f3b50bb4901 /drivers/net/xen-netback/interface.c | |
| parent | tcp: include locally failed retries in retransmission stats (diff) | |
| parent | batman-adv: Fix includes for IS_ERR/ERR_PTR (diff) | |
| download | kernel-936f459bea07868723b057ece43d321446c82f0a.tar.gz kernel-936f459bea07868723b057ece43d321446c82f0a.zip | |
Merge tag 'batadv-next-for-davem-20170128' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are two fixes for batman-adv for net-next:
- fix double call of dev_queue_xmit(), caused by the recent introduction
of net_xmit_eval(), by Sven Eckelmann
- Fix includes for IS_ERR/ERR_PTR, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
0 files changed, 0 insertions, 0 deletions