mirror of https://gitee.com/openkylin/linux.git
net: qualcomm: Improve readability of length defines
In order to avoid mixing things up, make the MTU and frame length defines easier to read. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0324e75db2
commit
2280e3cf1d
drivers/net/ethernet/qualcomm
|
@ -117,7 +117,7 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by
|
|||
break;
|
||||
case QCAFRM_WAIT_RSVD_BYTE2:
|
||||
len = handle->offset;
|
||||
if (len > buf_len || len < QCAFRM_ETHMINLEN) {
|
||||
if (len > buf_len || len < QCAFRM_MIN_LEN) {
|
||||
ret = QCAFRM_INVLEN;
|
||||
handle->state = QCAFRM_HW_LEN0;
|
||||
} else {
|
||||
|
|
|
@ -44,12 +44,12 @@
|
|||
#define QCAFRM_INVFRAME (QCAFRM_ERR_BASE - 4)
|
||||
|
||||
/* Min/Max Ethernet MTU: 46/1500 */
|
||||
#define QCAFRM_ETHMINMTU (ETH_ZLEN - ETH_HLEN)
|
||||
#define QCAFRM_ETHMAXMTU ETH_DATA_LEN
|
||||
#define QCAFRM_MIN_MTU (ETH_ZLEN - ETH_HLEN)
|
||||
#define QCAFRM_MAX_MTU ETH_DATA_LEN
|
||||
|
||||
/* Min/Max frame lengths */
|
||||
#define QCAFRM_ETHMINLEN (QCAFRM_ETHMINMTU + ETH_HLEN)
|
||||
#define QCAFRM_ETHMAXLEN (QCAFRM_ETHMAXMTU + VLAN_ETH_HLEN)
|
||||
#define QCAFRM_MIN_LEN (QCAFRM_MIN_MTU + ETH_HLEN)
|
||||
#define QCAFRM_MAX_LEN (QCAFRM_MAX_MTU + VLAN_ETH_HLEN)
|
||||
|
||||
/* QCA7K header len */
|
||||
#define QCAFRM_HEADER_LEN 8
|
||||
|
|
|
@ -69,7 +69,7 @@ static int qcaspi_pluggable = QCASPI_PLUGGABLE_MIN;
|
|||
module_param(qcaspi_pluggable, int, 0);
|
||||
MODULE_PARM_DESC(qcaspi_pluggable, "Pluggable SPI connection (yes/no).");
|
||||
|
||||
#define QCASPI_MTU QCAFRM_ETHMAXMTU
|
||||
#define QCASPI_MTU QCAFRM_MAX_MTU
|
||||
#define QCASPI_TX_TIMEOUT (1 * HZ)
|
||||
#define QCASPI_QCA7K_REBOOT_TIME_MS 1000
|
||||
|
||||
|
@ -403,7 +403,7 @@ qcaspi_tx_ring_has_space(struct tx_ring *txr)
|
|||
if (txr->skb[txr->tail])
|
||||
return 0;
|
||||
|
||||
return (txr->size + QCAFRM_ETHMAXLEN < QCASPI_HW_BUF_LEN) ? 1 : 0;
|
||||
return (txr->size + QCAFRM_MAX_LEN < QCASPI_HW_BUF_LEN) ? 1 : 0;
|
||||
}
|
||||
|
||||
/* Flush the tx ring. This function is only safe to
|
||||
|
@ -667,8 +667,8 @@ qcaspi_netdev_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
struct sk_buff *tskb;
|
||||
u8 pad_len = 0;
|
||||
|
||||
if (skb->len < QCAFRM_ETHMINLEN)
|
||||
pad_len = QCAFRM_ETHMINLEN - skb->len;
|
||||
if (skb->len < QCAFRM_MIN_LEN)
|
||||
pad_len = QCAFRM_MIN_LEN - skb->len;
|
||||
|
||||
if (qca->txr.skb[qca->txr.tail]) {
|
||||
netdev_warn(qca->net_dev, "queue was unexpectedly full!\n");
|
||||
|
@ -805,8 +805,8 @@ qcaspi_netdev_setup(struct net_device *dev)
|
|||
dev->tx_queue_len = 100;
|
||||
|
||||
/* MTU range: 46 - 1500 */
|
||||
dev->min_mtu = QCAFRM_ETHMINMTU;
|
||||
dev->max_mtu = QCAFRM_ETHMAXMTU;
|
||||
dev->min_mtu = QCAFRM_MIN_MTU;
|
||||
dev->max_mtu = QCAFRM_MAX_MTU;
|
||||
|
||||
qca = netdev_priv(dev);
|
||||
memset(qca, 0, sizeof(struct qcaspi));
|
||||
|
|
Loading…
Reference in New Issue