qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

atheros: update to 3.3.4 (based on work by acoul), fix mvswitch driver for newer kernels

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31625 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2012-05-06 17:08:30 +00:00
parent ee6dea474f
commit f31721e174
33 changed files with 422 additions and 7687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/generic/files/drivers/net/phy/mvswitch.c
View File

@@ -43,7 +43,6 @@ MODULE_LICENSE("GPL");
struct mvswitch_priv {
const struct net_device_ops *ndo_old;
struct net_device_ops ndo;
struct vlan_group *grp;
u8 vlans[16];
};
@@ -162,9 +161,6 @@ mvswitch_mangle_rx(struct sk_buff *skb, int napi)
if (!priv)
goto error;
if (!priv->grp)
goto error;
#ifdef HEADER_MODE
buf = skb->data;
skb_pull(skb, MV_HEADER_SIZE);
@@ -185,10 +181,11 @@ mvswitch_mangle_rx(struct sk_buff *skb, int napi)
skb->protocol = eth_type_trans(skb, skb->dev);
__vlan_hwaccel_put_tag(skb, vlan);
if (napi)
return vlan_hwaccel_receive_skb(skb, priv->grp, vlan);
return netif_receive_skb(skb);
else
return vlan_hwaccel_rx(skb, priv->grp, vlan);
return netif_rx(skb);
error:
/* no vlan? eat the packet! */
@@ -210,14 +207,6 @@ mvswitch_netif_receive_skb(struct sk_buff *skb)
}
static void
mvswitch_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
{
struct mvswitch_priv *priv = dev->phy_ptr;
priv->grp = grp;
}
static int
mvswitch_wait_mask(struct phy_device *pdev, int addr, int reg, u16 mask, u16 val)
{
@@ -346,7 +335,6 @@ mvswitch_config_init(struct phy_device *pdev)
priv->ndo_old = dev->netdev_ops;
memcpy(&priv->ndo, priv->ndo_old, sizeof(struct net_device_ops));
priv->ndo.ndo_start_xmit = mvswitch_mangle_tx;
priv->ndo.ndo_vlan_rx_register = mvswitch_vlan_rx_register;
dev->netdev_ops = &priv->ndo;
pdev->pkt_align = 2;