diff options
| author | David S. Miller | 2016-05-04 22:21:08 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-05-04 22:21:08 +0200 |
| commit | 5332174a83720921a5ef6db8080a8691f7ccbc27 (patch) | |
| tree | c1dca18d5f12429dd911677855e0a773b56e85a9 /net/batman-adv/send.c | |
| parent | mdio_bus: don't return NULL from mdiobus_scan() (diff) | |
| parent | batman-adv: Split batadv_iv_ogm_orig_del_if function (diff) | |
| download | kernel-qcow2-linux-5332174a83720921a5ef6db8080a8691f7ccbc27.tar.gz kernel-qcow2-linux-5332174a83720921a5ef6db8080a8691f7ccbc27.tar.xz kernel-qcow2-linux-5332174a83720921a5ef6db8080a8691f7ccbc27.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
pull request: batman-adv 20160504
In this pull request you have:
- two changes to the MAINTAINERS file where one marks our mailing list
as moderated and the other adds a missing documentation file
- kernel-doc fixes
- code refactoring and various cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/send.c')
| -rw-r--r-- | net/batman-adv/send.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 76417850d3fc..99ea9001cf8a 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -552,7 +552,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) struct net_device *soft_iface; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, delayed_work); soft_iface = forw_packet->if_incoming->soft_iface; @@ -604,7 +604,7 @@ void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work) struct batadv_forw_packet *forw_packet; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, delayed_work); bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); |