diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2013-04-30 08:16:53 (GMT) |
|---|---|---|
| committer | Emil Medve <Emilian.Medve@Freescale.com> | 2013-04-30 08:16:53 (GMT) |
| commit | 0cbaf4d585e454a87a718be69185846ce774db4c (patch) | |
| tree | 306c0a8db9f797baa94ccdb7c8536242f1fbc39d /drivers/net/ethernet/ti | |
| parent | da3a388231d98dadb89dc0d9f1842e9cbcc01bbc (diff) | |
| download | linux-fsl-qoriq-0cbaf4d585e454a87a718be69185846ce774db4c.tar.xz | |
net/cpsw: revert 80d5c3689b886308247da295a228a54df49a44f6
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'drivers/net/ethernet/ti')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index d289638..f0d8fdf 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1286,7 +1286,7 @@ clean_vid: } static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev, - __be16 proto, u16 vid) + unsigned short vid) { struct cpsw_priv *priv = netdev_priv(ndev); @@ -1298,7 +1298,7 @@ static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev, } static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev, - __be16 proto, u16 vid) + unsigned short vid) { struct cpsw_priv *priv = netdev_priv(ndev); int ret; |