leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gianfar: Clean up implementation of RX network flow classification

Browse Source 
This code was cribbed from niu, so gfar_set_hash_opts() begins by
converting the ethtool flow class code into a class code for Sun
Neptune hardware, then does the same thing again for the hardware it's
really dealing with.  It may also return -1 (-EPERM) for some
unhandled ethtool flow class codes.

Remove the useless code and definitions, and fix the error code.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2011-04-08 13:45:11 +00:00 committed by David S. Miller
parent 1b3291241a
commit bde3528f17
2 changed files with 1 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/gianfar.h
View File

@ -382,23 +382,6 @@ extern const char gfar_driver_version[];
#define BD_LFLAG(flags) ((flags) << 16) #define BD_LFLAG(flags) ((flags) << 16)
#define BD_LENGTH_MASK 0x0000ffff #define BD_LENGTH_MASK 0x0000ffff
#define CLASS_CODE_UNRECOG 0x00
#define CLASS_CODE_DUMMY1 0x01
#define CLASS_CODE_ETHERTYPE1 0x02
#define CLASS_CODE_ETHERTYPE2 0x03
#define CLASS_CODE_USER_PROG1 0x04
#define CLASS_CODE_USER_PROG2 0x05
#define CLASS_CODE_USER_PROG3 0x06
#define CLASS_CODE_USER_PROG4 0x07
#define CLASS_CODE_TCP_IPV4 0x08
#define CLASS_CODE_UDP_IPV4 0x09
#define CLASS_CODE_AH_ESP_IPV4 0x0a
#define CLASS_CODE_SCTP_IPV4 0x0b
#define CLASS_CODE_TCP_IPV6 0x0c
#define CLASS_CODE_UDP_IPV6 0x0d
#define CLASS_CODE_AH_ESP_IPV6 0x0e
#define CLASS_CODE_SCTP_IPV6 0x0f
#define FPR_FILER_MASK 0xFFFFFFFF #define FPR_FILER_MASK 0xFFFFFFFF
#define MAX_FILER_IDX 0xFF #define MAX_FILER_IDX 0xFF

52
drivers/net/gianfar_ethtool.c
View File

@ -645,42 +645,6 @@ static int gfar_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
} }
#endif #endif
static int gfar_ethflow_to_class(int flow_type, u64 *class)
{
switch (flow_type) {
case TCP_V4_FLOW:
*class = CLASS_CODE_TCP_IPV4;
break;
case UDP_V4_FLOW:
*class = CLASS_CODE_UDP_IPV4;
break;
case AH_V4_FLOW:
case ESP_V4_FLOW:
*class = CLASS_CODE_AH_ESP_IPV4;
break;
case SCTP_V4_FLOW:
*class = CLASS_CODE_SCTP_IPV4;
break;
case TCP_V6_FLOW:
*class = CLASS_CODE_TCP_IPV6;
break;
case UDP_V6_FLOW:
*class = CLASS_CODE_UDP_IPV6;
break;
case AH_V6_FLOW:
case ESP_V6_FLOW:
*class = CLASS_CODE_AH_ESP_IPV6;
break;
case SCTP_V6_FLOW:
*class = CLASS_CODE_SCTP_IPV6;
break;
default:
return 0;
}
return 1;
}
static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow) static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
{ {
u32 fcr = 0x0, fpr = FPR_FILER_MASK; u32 fcr = 0x0, fpr = FPR_FILER_MASK;
@ -778,11 +742,6 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
case UDP_V6_FLOW: case UDP_V6_FLOW:
cmp_rqfpr = RQFPR_IPV6 |RQFPR_UDP; cmp_rqfpr = RQFPR_IPV6 |RQFPR_UDP;
break; break;
case IPV4_FLOW:
cmp_rqfpr = RQFPR_IPV4;
case IPV6_FLOW:
cmp_rqfpr = RQFPR_IPV6;
break;
default: default:
printk(KERN_ERR "Right now this class is not supported\n"); printk(KERN_ERR "Right now this class is not supported\n");
return 0; return 0;
@ -848,18 +807,9 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
static int gfar_set_hash_opts(struct gfar_private *priv, struct ethtool_rxnfc *cmd) static int gfar_set_hash_opts(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
{ {
u64 class;
if (!gfar_ethflow_to_class(cmd->flow_type, &class))
return -EINVAL;
if (class < CLASS_CODE_USER_PROG1 ||
class > CLASS_CODE_SCTP_IPV6)
return -EINVAL;
/* write the filer rules here */ /* write the filer rules here */
if (!gfar_ethflow_to_filer_table(priv, cmd->data, cmd->flow_type)) if (!gfar_ethflow_to_filer_table(priv, cmd->data, cmd->flow_type))
return -1; return -EINVAL;
return 0; return 0;
} }