* [B.A.T.M.A.N.] eth_hdr/skb_reset_mac_header changes
@ 2014-01-18 18:31 Linus Lüssing
2014-01-18 18:31 ` [B.A.T.M.A.N.] [PATCHv4 1/2] batman-adv: use eth_hdr() instead of skb->data in interface_tx path Linus Lüssing
2014-01-18 18:31 ` [B.A.T.M.A.N.] [PATCHv4 2/2] batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx() Linus Lüssing
0 siblings, 2 replies; 3+ messages in thread
From: Linus Lüssing @ 2014-01-18 18:31 UTC (permalink / raw)
To: b.a.t.m.a.n
Changes for v4:
* removed one newline which slipped in with v3
* split the v3 patch in two ones
^ permalink raw reply [flat|nested] 3+ messages in thread
* [B.A.T.M.A.N.] [PATCHv4 1/2] batman-adv: use eth_hdr() instead of skb->data in interface_tx path
2014-01-18 18:31 [B.A.T.M.A.N.] eth_hdr/skb_reset_mac_header changes Linus Lüssing
@ 2014-01-18 18:31 ` Linus Lüssing
2014-01-18 18:31 ` [B.A.T.M.A.N.] [PATCHv4 2/2] batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx() Linus Lüssing
1 sibling, 0 replies; 3+ messages in thread
From: Linus Lüssing @ 2014-01-18 18:31 UTC (permalink / raw)
To: b.a.t.m.a.n
Our .ndo_start_xmit handler (batadv_interface_tx()) can rely on having
the skb ether header pointer set correctly since the following commit
present in kernels >= 3.9:
"net: reset mac header in dev_start_xmit()" (6d1ccff627)
Therefore we can safely use eth_hdr() instead of skb->data now, which
spares us some ugly type casts.
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
---
compat.h | 35 +++++++++++++++++++++++++++++++++++
soft-interface.c | 6 +++---
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/compat.h b/compat.h
index 57c9d96..8a0ccc5 100644
--- a/compat.h
+++ b/compat.h
@@ -332,6 +332,41 @@ static int __batadv_interface_set_mac_addr(x, y)
pos && ({ n = pos->member.next; 1; }); \
pos = hlist_entry_safe(n, typeof(*pos), member))
+#define BATADV_SET_ETHTOOL_OPS(netdev, ops) \
+ ((netdev)->ethtool_ops = (ops))
+
+#define __batadv_interface_tx \
+ ({ \
+ int func(struct sk_buff *skb, struct net_device *soft_iface) \
+ { \
+ skb_reset_mac_header(skb); \
+ return batadv_interface_tx(skb, soft_iface); \
+ } \
+ &func; \
+ })
+
+#undef SET_ETHTOOL_OPS
+#define SET_ETHTOOL_OPS(dev, batadv_ethtool_ops) \
+ ({ \
+ const struct net_device_ops my_net_device_ops = { \
+ .ndo_init = batadv_softif_init_late, \
+ .ndo_open = batadv_interface_open, \
+ .ndo_stop = batadv_interface_release, \
+ .ndo_get_stats = batadv_interface_stats, \
+ .ndo_vlan_rx_add_vid = batadv_interface_add_vid, \
+ .ndo_vlan_rx_kill_vid = batadv_interface_kill_vid, \
+ .ndo_set_mac_address = batadv_interface_set_mac_addr, \
+ .ndo_change_mtu = batadv_interface_change_mtu, \
+ .ndo_set_rx_mode = batadv_interface_set_rx_mode, \
+ .ndo_start_xmit = __batadv_interface_tx, \
+ .ndo_validate_addr = eth_validate_addr, \
+ .ndo_add_slave = batadv_softif_slave_add, \
+ .ndo_del_slave = batadv_softif_slave_del, \
+ }; \
+ dev->netdev_ops = &my_net_device_ops; \
+ BATADV_SET_ETHTOOL_OPS(dev, batadv_ethtool_ops); \
+ })
+
#endif /* < KERNEL_VERSION(3, 9, 0) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
diff --git a/soft-interface.c b/soft-interface.c
index f82c267..66903a1 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -176,7 +176,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
soft_iface->trans_start = jiffies;
vid = batadv_get_vid(skb, 0);
- ethhdr = (struct ethhdr *)skb->data;
+ ethhdr = eth_hdr(skb);
switch (ntohs(ethhdr->h_proto)) {
case ETH_P_8021Q:
@@ -194,7 +194,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
goto dropped;
/* skb->data might have been reallocated by batadv_bla_tx() */
- ethhdr = (struct ethhdr *)skb->data;
+ ethhdr = eth_hdr(skb);
/* Register the client MAC in the transtable */
if (!is_multicast_ether_addr(ethhdr->h_source)) {
@@ -230,7 +230,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
/* skb->data may have been modified by
* batadv_gw_dhcp_recipient_get()
*/
- ethhdr = (struct ethhdr *)skb->data;
+ ethhdr = eth_hdr(skb);
/* if gw_mode is on, broadcast any non-DHCP message.
* All the DHCP packets are going to be sent as unicast
*/
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [B.A.T.M.A.N.] [PATCHv4 2/2] batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx()
2014-01-18 18:31 [B.A.T.M.A.N.] eth_hdr/skb_reset_mac_header changes Linus Lüssing
2014-01-18 18:31 ` [B.A.T.M.A.N.] [PATCHv4 1/2] batman-adv: use eth_hdr() instead of skb->data in interface_tx path Linus Lüssing
@ 2014-01-18 18:31 ` Linus Lüssing
1 sibling, 0 replies; 3+ messages in thread
From: Linus Lüssing @ 2014-01-18 18:31 UTC (permalink / raw)
To: b.a.t.m.a.n
Our .ndo_start_xmit handler (batadv_interface_tx()) can rely on having
the skb ether header pointer set correctly since the following commit
present in kernels >= 3.9:
"net: reset mac header in dev_start_xmit()" (6d1ccff627)
Therefore this commit removes the according, now redundant,
skb_reset_mac_header() call in batadv_bla_tx().
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
---
bridge_loop_avoidance.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index 5c0eda4..26ec489 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
@@ -1535,9 +1535,6 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,
if (!atomic_read(&bat_priv->bridge_loop_avoidance))
goto allow;
- /* in VLAN case, the mac header might not be set. */
- skb_reset_mac_header(skb);
-
if (batadv_bla_process_claim(bat_priv, primary_if, skb))
goto handled;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-18 18:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-18 18:31 [B.A.T.M.A.N.] eth_hdr/skb_reset_mac_header changes Linus Lüssing
2014-01-18 18:31 ` [B.A.T.M.A.N.] [PATCHv4 1/2] batman-adv: use eth_hdr() instead of skb->data in interface_tx path Linus Lüssing
2014-01-18 18:31 ` [B.A.T.M.A.N.] [PATCHv4 2/2] batman-adv: remove obsolete skb_reset_mac_header() in batadv_bla_tx() Linus Lüssing
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).