From e621b6ac30831705e2557f0cb5f754ff928701bc Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 17 Jul 2012 11:35:06 -0400 Subject: [PATCH 24/76] 721-phy_packets Import of the above patch from openwrt trunk, as of this commit: ---------- commit c1d79f64eed0a7ac36b5b9bca52275b397bec424 Author: nbd Date: Mon Jul 16 16:26:51 2012 +0000 uboot-ar71xx: fix compile on recent mac os x versions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32750 3c298f89-4303-0410-b956-a3cf2f4a3e73 ---------- Path to patch in the repo is: target/linux/generic/patches-3.3 Repo is: git://nbd.name/openwrt.git Signed-off-by: Paul Gortmaker --- include/linux/netdevice.h | 8 ++++++++ include/linux/skbuff.h | 14 ++++---------- include/uapi/linux/if.h | 1 + net/Kconfig | 6 ++++++ net/core/dev.c | 32 ++++++++++++++++++++++++++------ net/core/skbuff.c | 17 +++++++++++++++++ net/ethernet/eth.c | 6 ++++++ 7 files changed, 68 insertions(+), 16 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 96e4c21..5372330 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1109,6 +1109,11 @@ struct net_device { const struct net_device_ops *netdev_ops; const struct ethtool_ops *ethtool_ops; +#ifdef CONFIG_ETHERNET_PACKET_MANGLE + void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb); + struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb); +#endif + /* Hardware header description */ const struct header_ops *header_ops; @@ -1172,6 +1177,9 @@ struct net_device { void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ +#ifdef CONFIG_ETHERNET_PACKET_MANGLE + void *phy_ptr; /* PHY device specific data */ +#endif /* * Cache lines mostly used on receive path (including eth_type_trans()) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index dec1748..f35cb0d 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1951,6 +1951,10 @@ extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int length, gfp_t gfp_mask); +extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length, gfp_t gfp); + + /** * netdev_alloc_skb - allocate an skbuff for rx on a specific device * @dev: network device to receive on @@ -1984,16 +1988,6 @@ static inline struct sk_buff *dev_alloc_skb(unsigned int length) } -static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, - unsigned int length, gfp_t gfp) -{ - struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); - - if (NET_IP_ALIGN && skb) - skb_reserve(skb, NET_IP_ALIGN); - return skb; -} - static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, unsigned int length) { diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h index 1ec407b..aa8f793 100644 --- a/include/uapi/linux/if.h +++ b/include/uapi/linux/if.h @@ -83,6 +83,7 @@ #define IFF_SUPP_NOFCS 0x80000 /* device supports sending custom FCS */ #define IFF_LIVE_ADDR_CHANGE 0x100000 /* device supports hardware address * change when it's running */ +#define IFF_NO_IP_ALIGN 0x100000 /* do not ip-align allocated rx pkts */ #define IF_GET_IFACE 0x0001 /* for querying only */ diff --git a/net/Kconfig b/net/Kconfig index 2ddc904..dded77d 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -23,6 +23,12 @@ menuconfig NET if NET +config ETHERNET_PACKET_MANGLE + bool + help + This option can be selected by phy drivers that need to mangle + packets going in or out of an ethernet device. + config WANT_COMPAT_NETLINK_MESSAGES bool help diff --git a/net/core/dev.c b/net/core/dev.c index 7ddbb31..1c76f6a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2576,9 +2576,19 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, if (!list_empty(&ptype_all)) dev_queue_xmit_nit(skb, dev); - skb_len = skb->len; - rc = ops->ndo_start_xmit(skb, dev); - trace_net_dev_xmit(skb, rc, dev, skb_len); +#ifdef CONFIG_ETHERNET_PACKET_MANGLE + if (!dev->eth_mangle_tx || + (skb = dev->eth_mangle_tx(dev, skb)) != NULL) +#else + if (1) +#endif + { + skb_len = skb->len; + rc = ops->ndo_start_xmit(skb, dev); + trace_net_dev_xmit(skb, rc, dev, skb_len); + } else { + rc = NETDEV_TX_OK; + } if (rc == NETDEV_TX_OK) txq_trans_update(txq); return rc; @@ -2594,9 +2604,19 @@ gso: if (!list_empty(&ptype_all)) dev_queue_xmit_nit(nskb, dev); - skb_len = nskb->len; - rc = ops->ndo_start_xmit(nskb, dev); - trace_net_dev_xmit(nskb, rc, dev, skb_len); +#ifdef CONFIG_ETHERNET_PACKET_MANGLE + if (!dev->eth_mangle_tx || + (nskb = dev->eth_mangle_tx(dev, nskb)) != NULL) +#else + if (1) +#endif + { + skb_len = nskb->len; + rc = ops->ndo_start_xmit(nskb, dev); + trace_net_dev_xmit(nskb, rc, dev, skb_len); + } else { + rc = NETDEV_TX_OK; + } if (unlikely(rc != NETDEV_TX_OK)) { if (rc & ~NETDEV_TX_MASK) goto out_kfree_gso_skb; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 1c1738c..1188041 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include @@ -471,6 +472,22 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, } EXPORT_SYMBOL(__netdev_alloc_skb); +struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length, gfp_t gfp) +{ + struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); + +#ifdef CONFIG_ETHERNET_PACKET_MANGLE + if (dev->priv_flags & IFF_NO_IP_ALIGN) + return skb; +#endif + + if (NET_IP_ALIGN && skb) + skb_reserve(skb, NET_IP_ALIGN); + return skb; +} +EXPORT_SYMBOL(__netdev_alloc_skb_ip_align); + void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, int size, unsigned int truesize) { diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 5359560..05646f8 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -159,6 +159,12 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) struct ethhdr *eth; skb->dev = dev; + +#ifdef CONFIG_ETHERNET_PACKET_MANGLE + if (dev->eth_mangle_rx) + dev->eth_mangle_rx(dev, skb); +#endif + skb_reset_mac_header(skb); skb_pull_inline(skb, ETH_HLEN); eth = eth_hdr(skb); -- 1.7.10.4