xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: make the .flow_dissect tagger callback return void

Browse Source 
There is no tagger that returns anything other than zero, so just change
the return type appropriately.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean
2020-09-26 22:32:05 +03:00
committed by David S. Miller
parent 5124197ce5
commit 2e8cb1b3db
8 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/dsa/tag_brcm.c
View File

@@ -150,8 +150,8 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb,
return skb;
}
static int brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
static void brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
{
/* We have been called on the DSA master network device after
* eth_type_trans() which pulled the Ethernet header already.
@@ -168,7 +168,6 @@ static int brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
*/
*offset = BRCM_TAG_LEN;
*proto = ((__be16 *)skb->data)[1];
return 0;
}
#endif

5
net/dsa/tag_dsa.c
View File

@@ -142,12 +142,11 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,
return skb;
}
static int dsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
static void dsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
{
*offset = 4;
*proto = ((__be16 *)skb->data)[1];
return 0;
}
static const struct dsa_device_ops dsa_netdev_ops = {

5
net/dsa/tag_edsa.c
View File

@@ -192,12 +192,11 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,
return skb;
}
static int edsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
static void edsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
{
*offset = 8;
*proto = ((__be16 *)skb->data)[3];
return 0;
}
static const struct dsa_device_ops edsa_netdev_ops = {

6
net/dsa/tag_mtk.c
View File

@@ -105,13 +105,11 @@ static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
return skb;
}
static int mtk_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
static void mtk_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
{
*offset = 4;
*proto = ((__be16 *)skb->data)[1];
return 0;
}
static const struct dsa_device_ops mtk_netdev_ops = {

6
net/dsa/tag_qca.c
View File

@@ -89,13 +89,11 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
return skb;
}
static int qca_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
static void qca_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
{
*offset = QCA_HDR_LEN;
*proto = ((__be16 *)skb->data)[0];
return 0;
}
static const struct dsa_device_ops qca_netdev_ops = {

6
net/dsa/tag_rtl4_a.c
View File

@@ -106,14 +106,12 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb,
return skb;
}
static int rtl4a_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
static void rtl4a_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,
int *offset)
{
*offset = RTL4_A_HDR_LEN;
/* Skip past the tag and fetch the encapsulated Ethertype */
*proto = ((__be16 *)skb->data)[1];
return 0;
}
static const struct dsa_device_ops rtl4a_netdev_ops = {