kernel: rewrite the phy packet hook, put it in the network stack to avoid having to keep non-upstream ethernet driver changes
SVN-Revision: 31637master
parent
c3f0b757a3
commit
0ff3c396d3
@ -1,70 +0,0 @@ |
||||
--- a/drivers/net/ethernet/ti/cpmac.c
|
||||
+++ b/drivers/net/ethernet/ti/cpmac.c
|
||||
@@ -373,6 +373,7 @@ static struct sk_buff *cpmac_rx_one(stru
|
||||
struct cpmac_desc *desc)
|
||||
{
|
||||
struct sk_buff *skb, *result = NULL;
|
||||
+ int offset;
|
||||
|
||||
if (unlikely(netif_msg_hw(priv)))
|
||||
cpmac_dump_desc(priv->dev, desc);
|
||||
@@ -384,10 +385,15 @@ static struct sk_buff *cpmac_rx_one(stru
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- skb = netdev_alloc_skb_ip_align(priv->dev, CPMAC_SKB_SIZE);
|
||||
+ skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
|
||||
if (likely(skb)) {
|
||||
+ offset = 2;
|
||||
+ if (priv->phy) {
|
||||
+ offset += priv->phy->pkt_align;
|
||||
+ }
|
||||
+ skb_reserve(skb, offset);
|
||||
+
|
||||
skb_put(desc->skb, desc->datalen);
|
||||
- desc->skb->protocol = eth_type_trans(desc->skb, priv->dev);
|
||||
skb_checksum_none_assert(desc->skb);
|
||||
priv->dev->stats.rx_packets++;
|
||||
priv->dev->stats.rx_bytes += desc->datalen;
|
||||
@@ -459,7 +465,12 @@ static int cpmac_poll(struct napi_struct
|
||||
|
||||
skb = cpmac_rx_one(priv, desc);
|
||||
if (likely(skb)) {
|
||||
- netif_receive_skb(skb);
|
||||
+ if (priv->phy->netif_receive_skb) {
|
||||
+ priv->phy->netif_receive_skb(skb);
|
||||
+ } else {
|
||||
+ skb->protocol = eth_type_trans(skb, priv->dev);
|
||||
+ netif_receive_skb(skb);
|
||||
+ }
|
||||
received++;
|
||||
}
|
||||
desc = desc->next;
|
||||
@@ -952,7 +963,7 @@ static void cpmac_adjust_link(struct net
|
||||
|
||||
static int cpmac_open(struct net_device *dev)
|
||||
{
|
||||
- int i, size, res;
|
||||
+ int i, size, res, offset;
|
||||
struct cpmac_priv *priv = netdev_priv(dev);
|
||||
struct resource *mem;
|
||||
struct cpmac_desc *desc;
|
||||
@@ -991,11 +1002,17 @@ static int cpmac_open(struct net_device
|
||||
|
||||
priv->rx_head = &priv->desc_ring[CPMAC_QUEUES];
|
||||
for (i = 0, desc = priv->rx_head; i < priv->ring_size; i++, desc++) {
|
||||
- skb = netdev_alloc_skb_ip_align(dev, CPMAC_SKB_SIZE);
|
||||
+ skb = netdev_alloc_skb(dev, CPMAC_SKB_SIZE);
|
||||
if (unlikely(!skb)) {
|
||||
res = -ENOMEM;
|
||||
goto fail_desc;
|
||||
}
|
||||
+ offset = 2;
|
||||
+ if (priv->phy) {
|
||||
+ offset += priv->phy->pkt_align;
|
||||
+ }
|
||||
+ skb_reserve(skb, offset);
|
||||
+
|
||||
desc->skb = skb;
|
||||
desc->data_mapping = dma_map_single(&dev->dev, skb->data,
|
||||
CPMAC_SKB_SIZE,
|
@ -1,70 +0,0 @@ |
||||
--- a/drivers/net/ethernet/ar231x/ar231x.c
|
||||
+++ b/drivers/net/ethernet/ar231x/ar231x.c
|
||||
@@ -745,6 +745,7 @@ static void ar231x_load_rx_ring(struct n
|
||||
for (i = 0; i < nr_bufs; i++) {
|
||||
struct sk_buff *skb;
|
||||
ar231x_descr_t *rd;
|
||||
+ int offset = RX_OFFSET;
|
||||
|
||||
if (sp->rx_skb[idx])
|
||||
break;
|
||||
@@ -760,7 +761,9 @@ static void ar231x_load_rx_ring(struct n
|
||||
* Make sure IP header starts on a fresh cache line.
|
||||
*/
|
||||
skb->dev = dev;
|
||||
- skb_reserve(skb, RX_OFFSET);
|
||||
+ if (sp->phy_dev)
|
||||
+ offset += sp->phy_dev->pkt_align;
|
||||
+ skb_reserve(skb, offset);
|
||||
sp->rx_skb[idx] = skb;
|
||||
|
||||
rd = (ar231x_descr_t *) & sp->rx_ring[idx];
|
||||
@@ -834,20 +837,23 @@ static int ar231x_rx_int(struct net_devi
|
||||
/* alloc new buffer. */
|
||||
skb_new = netdev_alloc_skb(dev, AR2313_BUFSIZE + RX_OFFSET);
|
||||
if (skb_new != NULL) {
|
||||
+ int offset;
|
||||
|
||||
skb = sp->rx_skb[idx];
|
||||
/* set skb */
|
||||
skb_put(skb,
|
||||
((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
|
||||
-
|
||||
dev->stats.rx_bytes += skb->len;
|
||||
- skb->protocol = eth_type_trans(skb, dev);
|
||||
- /* pass the packet to upper layers */
|
||||
- netif_rx(skb);
|
||||
|
||||
+ /* pass the packet to upper layers */
|
||||
+ sp->rx(skb);
|
||||
skb_new->dev = dev;
|
||||
+
|
||||
/* 16 bit align */
|
||||
- skb_reserve(skb_new, RX_OFFSET);
|
||||
+ offset = RX_OFFSET;
|
||||
+ if (sp->phy_dev)
|
||||
+ offset += sp->phy_dev->pkt_align;
|
||||
+ skb_reserve(skb_new, offset);
|
||||
/* reset descriptor's curr_addr */
|
||||
rxdesc->addr = virt_to_phys(skb_new->data);
|
||||
|
||||
@@ -1258,6 +1264,8 @@ static int ar231x_mdiobus_probe (struct
|
||||
return PTR_ERR(phydev);
|
||||
}
|
||||
|
||||
+ sp->rx = phydev->netif_rx;
|
||||
+
|
||||
/* mask with MAC supported features */
|
||||
phydev->supported &= (SUPPORTED_10baseT_Half
|
||||
| SUPPORTED_10baseT_Full
|
||||
--- a/drivers/net/ethernet/ar231x/ar231x.h
|
||||
+++ b/drivers/net/ethernet/ar231x/ar231x.h
|
||||
@@ -222,6 +222,8 @@ typedef struct {
|
||||
*/
|
||||
struct ar231x_private {
|
||||
struct net_device *dev;
|
||||
+ int (*rx)(struct sk_buff *skb);
|
||||
+
|
||||
int version;
|
||||
u32 mb[2];
|
||||
|
@ -1,63 +1,167 @@ |
||||
--- a/drivers/net/phy/phy_device.c
|
||||
+++ b/drivers/net/phy/phy_device.c
|
||||
@@ -149,6 +149,18 @@ int phy_scan_fixups(struct phy_device *p
|
||||
}
|
||||
EXPORT_SYMBOL(phy_scan_fixups);
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1103,6 +1103,11 @@ struct net_device {
|
||||
const struct net_device_ops *netdev_ops;
|
||||
const struct ethtool_ops *ethtool_ops;
|
||||
|
||||
+static int generic_receive_skb(struct sk_buff *skb)
|
||||
+{
|
||||
+ skb->protocol = eth_type_trans(skb, skb->dev);
|
||||
+ return netif_receive_skb(skb);
|
||||
+}
|
||||
+#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
|
||||
+
|
||||
+static int generic_rx(struct sk_buff *skb)
|
||||
+{
|
||||
+ skb->protocol = eth_type_trans(skb, skb->dev);
|
||||
+ return netif_rx(skb);
|
||||
+}
|
||||
+
|
||||
static struct phy_device* phy_device_create(struct mii_bus *bus,
|
||||
int addr, int phy_id)
|
||||
{
|
||||
@@ -180,6 +192,8 @@ static struct phy_device* phy_device_cre
|
||||
dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
|
||||
|
||||
dev->state = PHY_DOWN;
|
||||
+ dev->netif_receive_skb = &generic_receive_skb;
|
||||
+ dev->netif_rx = &generic_rx;
|
||||
|
||||
mutex_init(&dev->lock);
|
||||
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -334,6 +334,20 @@ struct phy_device {
|
||||
void (*adjust_link)(struct net_device *dev);
|
||||
|
||||
void (*adjust_state)(struct net_device *dev);
|
||||
+
|
||||
+ /*
|
||||
+ * By default these point to the original functions
|
||||
+ * with the same name. adding them to the phy_device
|
||||
+ * allows the phy driver to override them for packet
|
||||
+ * mangling if the ethernet driver supports it
|
||||
+ * This is required to support some really horrible
|
||||
+ * switches such as the Marvell 88E6060
|
||||
+ */
|
||||
+ int (*netif_receive_skb)(struct sk_buff *skb);
|
||||
+ int (*netif_rx)(struct sk_buff *skb);
|
||||
+
|
||||
+ /* alignment offset for packets */
|
||||
+ int pkt_align;
|
||||
};
|
||||
#define to_phy_device(d) container_of(d, struct phy_device, dev)
|
||||
/* Hardware header description */
|
||||
const struct header_ops *header_ops;
|
||||
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1158,6 +1158,7 @@ struct net_device {
|
||||
@@ -1158,6 +1163,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())
|
||||
--- a/include/linux/if.h
|
||||
+++ b/include/linux/if.h
|
||||
@@ -79,6 +79,7 @@
|
||||
#define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing
|
||||
* skbs on transmit */
|
||||
#define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */
|
||||
+#define IFF_NO_IP_ALIGN 0x40000 /* do not ip-align allocated rx pkts */
|
||||
|
||||
#define IF_GET_IFACE 0x0001 /* for querying only */
|
||||
#define IF_GET_PROTO 0x0002
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1636,6 +1636,10 @@ extern struct sk_buff *dev_alloc_skb(uns
|
||||
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
|
||||
@@ -1655,16 +1659,6 @@ static inline struct sk_buff *netdev_all
|
||||
return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
|
||||
}
|
||||
|
||||
-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)
|
||||
{
|
||||
--- 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
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -2224,9 +2224,19 @@ int dev_hard_start_xmit(struct sk_buff *
|
||||
}
|
||||
}
|
||||
|
||||
- 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;
|
||||
@@ -2246,9 +2256,19 @@ gso:
|
||||
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
|
||||
skb_dst_drop(nskb);
|
||||
|
||||
- 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;
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -271,6 +271,22 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
}
|
||||
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)
|
||||
{
|
||||
--- a/net/ethernet/eth.c
|
||||
+++ b/net/ethernet/eth.c
|
||||
@@ -160,6 +160,12 @@ __be16 eth_type_trans(struct sk_buff *sk
|
||||
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,63 +1,175 @@ |
||||
--- a/drivers/net/phy/phy_device.c
|
||||
+++ b/drivers/net/phy/phy_device.c
|
||||
@@ -149,6 +149,18 @@ int phy_scan_fixups(struct phy_device *p
|
||||
}
|
||||
EXPORT_SYMBOL(phy_scan_fixups);
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1078,6 +1078,11 @@ struct net_device {
|
||||
const struct net_device_ops *netdev_ops;
|
||||
const struct ethtool_ops *ethtool_ops;
|
||||
|
||||
+static int generic_receive_skb(struct sk_buff *skb)
|
||||
+{
|
||||
+ skb->protocol = eth_type_trans(skb, skb->dev);
|
||||
+ return netif_receive_skb(skb);
|
||||
+}
|
||||
+#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
|
||||
+
|
||||
+static int generic_rx(struct sk_buff *skb)
|
||||
+{
|
||||
+ skb->protocol = eth_type_trans(skb, skb->dev);
|
||||
+ return netif_rx(skb);
|
||||
+}
|
||||
+
|
||||
static struct phy_device* phy_device_create(struct mii_bus *bus,
|
||||
int addr, int phy_id)
|
||||
{
|
||||
@@ -180,6 +192,8 @@ static struct phy_device* phy_device_cre
|
||||
dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
|
||||
|
||||
dev->state = PHY_DOWN;
|
||||
+ dev->netif_receive_skb = &generic_receive_skb;
|
||||
+ dev->netif_rx = &generic_rx;
|
||||
|
||||
mutex_init(&dev->lock);
|
||||
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -339,6 +339,20 @@ struct phy_device {
|
||||
void (*adjust_link)(struct net_device *dev);
|
||||
|
||||
void (*adjust_state)(struct net_device *dev);
|
||||
+
|
||||
+ /*
|
||||
+ * By default these point to the original functions
|
||||
+ * with the same name. adding them to the phy_device
|
||||
+ * allows the phy driver to override them for packet
|
||||
+ * mangling if the ethernet driver supports it
|
||||
+ * This is required to support some really horrible
|
||||
+ * switches such as the Marvell 88E6060
|
||||
+ */
|
||||
+ int (*netif_receive_skb)(struct sk_buff *skb);
|
||||
+ int (*netif_rx)(struct sk_buff *skb);
|
||||
+
|
||||
+ /* alignment offset for packets */
|
||||
+ int pkt_align;
|
||||
};
|
||||
#define to_phy_device(d) container_of(d, struct phy_device, dev)
|
||||
/* Hardware header description */
|
||||
const struct header_ops *header_ops;
|
||||
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1134,6 +1134,7 @@ struct net_device {
|
||||
@@ -1134,6 +1139,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())
|
||||
--- a/include/linux/if.h
|
||||
+++ b/include/linux/if.h
|
||||
@@ -80,6 +80,7 @@
|
||||
* skbs on transmit */
|
||||
#define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */
|
||||
#define IFF_TEAM_PORT 0x40000 /* device used as team port */
|
||||
+#define IFF_NO_IP_ALIGN 0x80000 /* do not ip-align allocated rx pkts */
|
||||
|
||||
#define IF_GET_IFACE 0x0001 /* for querying only */
|
||||
#define IF_GET_PROTO 0x0002
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -1661,6 +1661,10 @@ extern struct sk_buff *dev_alloc_skb(uns
|
||||
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
|
||||
@@ -1680,16 +1684,6 @@ static inline struct sk_buff *netdev_all
|
||||
return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
|
||||
}
|
||||
|
||||
-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)
|
||||
{
|
||||
--- 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
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -2246,9 +2246,19 @@ int dev_hard_start_xmit(struct sk_buff *
|
||||
}
|
||||
}
|
||||
|
||||
- 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;
|
||||
@@ -2268,9 +2278,19 @@ gso:
|
||||
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
|
||||
skb_dst_drop(nskb);
|
||||
|
||||
- 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;
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -58,6 +58,7 @@
|
||||
#include <linux/scatterlist.h>
|
||||
#include <linux/errqueue.h>
|
||||
#include <linux/prefetch.h>
|
||||
+#include <linux/if.h>
|
||||
|
||||
#include <net/protocol.h>
|
||||
#include <net/dst.h>
|
||||
@@ -320,6 +321,22 @@ struct sk_buff *__netdev_alloc_skb(struc
|
||||
}
|
||||
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)
|
||||
{
|
||||
--- a/net/ethernet/eth.c
|
||||
+++ b/net/ethernet/eth.c
|
||||
@@ -160,6 +160,12 @@ __be16 eth_type_trans(struct sk_buff *sk
|
||||
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,17 +0,0 @@ |
||||
--- a/drivers/net/ethernet/lantiq_etop.c
|
||||
+++ b/drivers/net/ethernet/lantiq_etop.c
|
||||
@@ -188,8 +188,12 @@ ltq_etop_hw_receive(struct ltq_etop_chan
|
||||
|
||||
skb_put(skb, len);
|
||||
skb->dev = ch->netdev;
|
||||
- skb->protocol = eth_type_trans(skb, ch->netdev);
|
||||
- netif_receive_skb(skb);
|
||||
+ if (priv->phydev && priv->phydev->netif_receive_skb) {
|
||||
+ priv->phydev->netif_receive_skb(skb);
|
||||
+ } else {
|
||||
+ skb->protocol = eth_type_trans(skb, ch->netdev);
|
||||
+ netif_receive_skb(skb);
|
||||
+ }
|
||||
}
|
||||
|
||||
static int
|
Loading…
Reference in new issue