Revert "net: stmmac: Correct byte order of perfect_match"
This reverts commit 4e35d4a08d
.
This commit is contained in:
parent
9e3a5af4fc
commit
32d9b82df9
4 changed files with 5 additions and 5 deletions
drivers/net/ethernet/stmicro/stmmac
|
@ -938,7 +938,7 @@ static void dwmac4_set_mac_loopback(void __iomem *ioaddr, bool enable)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dwmac4_update_vlan_hash(struct mac_device_info *hw, u32 hash,
|
static void dwmac4_update_vlan_hash(struct mac_device_info *hw, u32 hash,
|
||||||
u16 perfect_match, bool is_double)
|
__le16 perfect_match, bool is_double)
|
||||||
{
|
{
|
||||||
void __iomem *ioaddr = hw->pcsr;
|
void __iomem *ioaddr = hw->pcsr;
|
||||||
u32 value;
|
u32 value;
|
||||||
|
|
|
@ -581,7 +581,7 @@ static int dwxgmac2_rss_configure(struct mac_device_info *hw,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash,
|
static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash,
|
||||||
u16 perfect_match, bool is_double)
|
__le16 perfect_match, bool is_double)
|
||||||
{
|
{
|
||||||
void __iomem *ioaddr = hw->pcsr;
|
void __iomem *ioaddr = hw->pcsr;
|
||||||
|
|
||||||
|
|
|
@ -368,7 +368,7 @@ struct stmmac_ops {
|
||||||
struct stmmac_rss *cfg, u32 num_rxq);
|
struct stmmac_rss *cfg, u32 num_rxq);
|
||||||
/* VLAN */
|
/* VLAN */
|
||||||
void (*update_vlan_hash)(struct mac_device_info *hw, u32 hash,
|
void (*update_vlan_hash)(struct mac_device_info *hw, u32 hash,
|
||||||
u16 perfect_match, bool is_double);
|
__le16 perfect_match, bool is_double);
|
||||||
void (*enable_vlan)(struct mac_device_info *hw, u32 type);
|
void (*enable_vlan)(struct mac_device_info *hw, u32 type);
|
||||||
int (*add_hw_vlan_rx_fltr)(struct net_device *dev,
|
int (*add_hw_vlan_rx_fltr)(struct net_device *dev,
|
||||||
struct mac_device_info *hw,
|
struct mac_device_info *hw,
|
||||||
|
|
|
@ -4660,7 +4660,7 @@ static u32 stmmac_vid_crc32_le(__le16 vid_le)
|
||||||
static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
|
static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
|
||||||
{
|
{
|
||||||
u32 crc, hash = 0;
|
u32 crc, hash = 0;
|
||||||
u16 pmatch = 0;
|
__le16 pmatch = 0;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
u16 vid = 0;
|
u16 vid = 0;
|
||||||
|
|
||||||
|
@ -4675,7 +4675,7 @@ static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
|
||||||
if (count > 2) /* VID = 0 always passes filter */
|
if (count > 2) /* VID = 0 always passes filter */
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
pmatch = vid;
|
pmatch = cpu_to_le16(vid);
|
||||||
hash = 0;
|
hash = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue