History

sh_eth: coding style fixes

Running 'scripts/checkpatch.pl' on the driver files gives numerous warnings: - block comments using empty /* line; - unneeded \ at end of lines; - message string split across lines; - use of __attribute__((aligned(n))) instead of __aligned(n) macro; - use of __attribute__((packed)) instead of __packed macro. Additionally, running 'scripts/checkpatch.pl --strict' gives more complaints: - including the paragraph about writing to FSF into the heading comment; - alignment not matching open paren; - multiple assignments on one line; - use of CamelCase names; - missing {} on one of the *if* arms where another has them; - spinlock definition without a comment. While fixing these, also do some more style cleanups: - remove useless () around expressions; - add {} around multi-line *if* operator's arm; - remove space before comma; - add spaces after /* and before */; - properly align continuation lines of broken up expressions; - realign comments to the structure fields.

Sergei Shtylyov committed 12 years ago

Commit 128296f1 parent 45ea3932 files · +75 −88Browse files

Unified · Split

2 files
  1. drivers/net/ethernet/renesas/sh_eth.c +52 −58
  2. drivers/net/ethernet/renesas/sh_eth.h +23 −30
drivers/net/ethernet/renesas/sh_eth.c+52−58
@@ -1,5 +1,4 @@
1−/*
2− * SuperH Ethernet device driver
1+/* SuperH Ethernet device driver
32 *
43 * Copyright (C) 2006-2012 Nobuhiro Iwamatsu
54 * Copyright (C) 2008-2013 Renesas Solutions Corp.
@@ -13,9 +12,6 @@ · 7 unmodified lines
1312 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1413 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
1514 * more details.
16− * You should have received a copy of the GNU General Public License along with
17− * this program; if not, write to the Free Software Foundation, Inc.,
18− * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
1915 *
2016 * The full GNU General Public License is included in this distribution in
2117 * the file called "COPYING".
@@ -646,8 +642,8 @@ static struct sh_eth_cpu_data sh7763_data = { · 624 unmodified lines
646642 .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
647643
648644 .tx_check = EESR_TC1 | EESR_FTC,
649− .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \
650− EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \
645+ .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
646+ EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE |
651647 EESR_ECI,
652648
653649 .apr = 1,
@@ -732,7 +728,7 @@ static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd) · 78 unmodified lines
732728 cd->ecsipr_value = DEFAULT_ECSIPR_INIT;
733729
734730 if (!cd->fcftr_value)
735− cd->fcftr_value = DEFAULT_FIFO_F_D_RFF | \
731+ cd->fcftr_value = DEFAULT_FIFO_F_D_RFF |
736732 DEFAULT_FIFO_F_D_RFD;
737733
738734 if (!cd->fdr_value)
@@ -849,20 +845,17 @@ static inline __u32 edmac_to_cpu(struct sh_eth_private *mdp, u32 x) · 110 unmodified lines
849845 return x;
850846 }
851847
852−/*
853− * Program the hardware MAC address from dev->dev_addr.
854− */
848+/* Program the hardware MAC address from dev->dev_addr. */
855849 static void update_mac_address(struct net_device *ndev)
856850 {
857851 sh_eth_write(ndev,
858− (ndev->dev_addr[0] << 24) | (ndev->dev_addr[1] << 16) |
859− (ndev->dev_addr[2] << 8) | (ndev->dev_addr[3]), MAHR);
852+ (ndev->dev_addr[0] << 24) | (ndev->dev_addr[1] << 16) |
853+ (ndev->dev_addr[2] << 8) | (ndev->dev_addr[3]), MAHR);
860854 sh_eth_write(ndev,
861− (ndev->dev_addr[4] << 8) | (ndev->dev_addr[5]), MALR);
855+ (ndev->dev_addr[4] << 8) | (ndev->dev_addr[5]), MALR);
862856 }
863857
864−/*
865− * Get MAC address from SuperH MAC address register
858+/* Get MAC address from SuperH MAC address register
866859 *
867860 * SuperH's Ethernet device doesn't have 'ROM' to MAC address.
868861 * This driver get MAC address that use by bootloader(U-boot or sh-ipl+g).
@@ -1019,8 +1012,10 @@ static void sh_eth_ring_format(struct net_device *ndev) · 150 unmodified lines
10191012 int rx_ringsize = sizeof(*rxdesc) * mdp->num_rx_ring;
10201013 int tx_ringsize = sizeof(*txdesc) * mdp->num_tx_ring;
10211014
1022− mdp->cur_rx = mdp->cur_tx = 0;
1023− mdp->dirty_rx = mdp->dirty_tx = 0;
1015+ mdp->cur_rx = 0;
1016+ mdp->cur_tx = 0;
1017+ mdp->dirty_rx = 0;
1018+ mdp->dirty_tx = 0;
10241019
10251020 memset(mdp->rx_ring, 0, rx_ringsize);
10261021
@@ -1033,7 +1028,7 @@ static void sh_eth_ring_format(struct net_device *ndev) · 6 unmodified lines
10331028 if (skb == NULL)
10341029 break;
10351030 dma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz,
1036− DMA_FROM_DEVICE);
1031+ DMA_FROM_DEVICE);
10371032 sh_eth_set_receive_align(skb);
10381033
10391034 /* RX descriptor */
@@ -1081,8 +1076,7 @@ static int sh_eth_ring_init(struct net_device *ndev) · 41 unmodified lines
10811076 struct sh_eth_private *mdp = netdev_priv(ndev);
10821077 int rx_ringsize, tx_ringsize, ret = 0;
10831078
1084− /*
1085− * +26 gets the maximum ethernet encapsulation, +7 & ~7 because the
1079+ /* +26 gets the maximum ethernet encapsulation, +7 & ~7 because the
10861080 * card needs room to do 8 byte alignment, +2 so we can reserve
10871081 * the first 2 bytes, and +16 gets room for the status word from the
10881082 * card.
@@ -1257,7 +1251,7 @@ static int sh_eth_txfree(struct net_device *ndev) · 168 unmodified lines
12571251 {
12581252 struct sh_eth_private *mdp = netdev_priv(ndev);
12591253 struct sh_eth_txdesc *txdesc;
1260− int freeNum = 0;
1254+ int free_num = 0;
12611255 int entry = 0;
12621256
12631257 for (; mdp->cur_tx - mdp->dirty_tx > 0; mdp->dirty_tx++) {
@@ -1271,7 +1265,7 @@ static int sh_eth_txfree(struct net_device *ndev) · 7 unmodified lines
12711265 txdesc->buffer_length, DMA_TO_DEVICE);
12721266 dev_kfree_skb_irq(mdp->tx_skbuff[entry]);
12731267 mdp->tx_skbuff[entry] = NULL;
1274− freeNum++;
1268+ free_num++;
12751269 }
12761270 txdesc->status = cpu_to_edmac(mdp, TD_TFP);
12771271 if (entry >= mdp->num_tx_ring - 1)
@@ -1280,7 +1274,7 @@ static int sh_eth_txfree(struct net_device *ndev) · 2 unmodified lines
12801274 ndev->stats.tx_packets++;
12811275 ndev->stats.tx_bytes += txdesc->buffer_length;
12821276 }
1283− return freeNum;
1277+ return free_num;
12841278 }
12851279
12861280 /* Packet receive function */
@@ -1313,8 +1307,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) · 26 unmodified lines
13131307 if (!(desc_status & RDFEND))
13141308 ndev->stats.rx_length_errors++;
13151309
1316− /*
1317− * In case of almost all GETHER/ETHERs, the Receive Frame State
1310+ /* In case of almost all GETHER/ETHERs, the Receive Frame State
13181311 * (RFS) bits in the Receive Descriptor 0 are from bit 9 to
13191312 * bit 0. However, in case of the R8A7740's GETHER, the RFS
13201313 * bits are from bit 25 to bit 16. So, the driver needs right
@@ -1374,7 +1367,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) · 53 unmodified lines
13741367 if (skb == NULL)
13751368 break; /* Better luck next round. */
13761369 dma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz,
1377− DMA_FROM_DEVICE);
1370+ DMA_FROM_DEVICE);
13781371 sh_eth_set_receive_align(skb);
13791372
13801373 skb_checksum_none_assert(skb);
@@ -1392,10 +1385,13 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) · 11 unmodified lines
13921385 /* If we don't need to check status, don't. -KDU */
13931386 if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R)) {
13941387 /* fix the values for the next receiving if RDE is set */
1395− if (intr_status & EESR_RDE)
1396− mdp->cur_rx = mdp->dirty_rx =
1397− (sh_eth_read(ndev, RDFAR) -
1398− sh_eth_read(ndev, RDLAR)) >> 4;
1388+ if (intr_status & EESR_RDE) {
1389+ u32 count = (sh_eth_read(ndev, RDFAR) -
1390+ sh_eth_read(ndev, RDLAR)) >> 4;
1391+
1392+ mdp->cur_rx = count;
1393+ mdp->dirty_rx = count;
1394+ }
13991395 sh_eth_write(ndev, EDRRR_R, EDRRR);
14001396 }
14011397
@@ -1438,17 +1434,17 @@ static void sh_eth_error(struct net_device *ndev, int intr_status) · 36 unmodified lines
14381434 if (mdp->ether_link_active_low)
14391435 link_stat = ~link_stat;
14401436 }
1441− if (!(link_stat & PHY_ST_LINK))
1437+ if (!(link_stat & PHY_ST_LINK)) {
14421438 sh_eth_rcv_snd_disable(ndev);
1443− else {
1439+ } else {
14441440 /* Link Up */
14451441 sh_eth_write(ndev, sh_eth_read(ndev, EESIPR) &
1446− ~DMAC_M_ECI, EESIPR);
1447− /*clear int */
1442+ ~DMAC_M_ECI, EESIPR);
1443+ /* clear int */
14481444 sh_eth_write(ndev, sh_eth_read(ndev, ECSR),
1449− ECSR);
1445+ ECSR);
14501446 sh_eth_write(ndev, sh_eth_read(ndev, EESIPR) |
1451− DMAC_M_ECI, EESIPR);
1447+ DMAC_M_ECI, EESIPR);
14521448 /* enable tx and rx */
14531449 sh_eth_rcv_snd_enable(ndev);
14541450 }
@@ -1519,9 +1515,9 @@ ignore_link: · 64 unmodified lines
15191515 u32 edtrr = sh_eth_read(ndev, EDTRR);
15201516 /* dmesg */
15211517 dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
1522− intr_status, mdp->cur_tx);
1518+ intr_status, mdp->cur_tx);
15231519 dev_err(&ndev->dev, "dirty_tx=%8.8x state=%8.8x EDTRR=%8.8x.\n",
1524− mdp->dirty_tx, (u32) ndev->state, edtrr);
1520+ mdp->dirty_tx, (u32) ndev->state, edtrr);
15251521 /* dirty buffer free */
15261522 sh_eth_txfree(ndev);
15271523
@@ -1644,7 +1640,8 @@ static void sh_eth_adjust_link(struct net_device *ndev) · 116 unmodified lines
16441640 }
16451641 if (!mdp->link) {
16461642 sh_eth_write(ndev,
1647− (sh_eth_read(ndev, ECMR) & ~ECMR_TXF), ECMR);
1643+ sh_eth_read(ndev, ECMR) & ~ECMR_TXF,
1644+ ECMR);
16481645 new_state = 1;
16491646 mdp->link = phydev->link;
16501647 if (mdp->cd->no_psr || mdp->no_ether_link)
@@ -1671,7 +1668,7 @@ static int sh_eth_phy_init(struct net_device *ndev) · 20 unmodified lines
16711668 struct phy_device *phydev = NULL;
16721669
16731670 snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
1674− mdp->mii_bus->id , mdp->phy_id);
1671+ mdp->mii_bus->id, mdp->phy_id);
16751672
16761673 mdp->link = 0;
16771674 mdp->speed = 0;
@@ -1709,7 +1706,7 @@ static int sh_eth_phy_start(struct net_device *ndev) · 31 unmodified lines
17091706 }
17101707
17111708 static int sh_eth_get_settings(struct net_device *ndev,
1712− struct ethtool_cmd *ecmd)
1709+ struct ethtool_cmd *ecmd)
17131710 {
17141711 struct sh_eth_private *mdp = netdev_priv(ndev);
17151712 unsigned long flags;
@@ -1723,7 +1720,7 @@ static int sh_eth_get_settings(struct net_device *ndev, · 7 unmodified lines
17231720 }
17241721
17251722 static int sh_eth_set_settings(struct net_device *ndev,
1726− struct ethtool_cmd *ecmd)
1723+ struct ethtool_cmd *ecmd)
17271724 {
17281725 struct sh_eth_private *mdp = netdev_priv(ndev);
17291726 unsigned long flags;
@@ -1799,7 +1796,7 @@ static int sh_eth_get_sset_count(struct net_device *netdev, int sset) · 69 unmodified lines
17991796 }
18001797
18011798 static void sh_eth_get_ethtool_stats(struct net_device *ndev,
1802− struct ethtool_stats *stats, u64 *data)
1799+ struct ethtool_stats *stats, u64 *data)
18031800 {
18041801 struct sh_eth_private *mdp = netdev_priv(ndev);
18051802 int i = 0;
@@ -1816,7 +1813,7 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data) · 10 unmodified lines
18161813 switch (stringset) {
18171814 case ETH_SS_STATS:
18181815 memcpy(data, *sh_eth_gstrings_stats,
1819− sizeof(sh_eth_gstrings_stats));
1816+ sizeof(sh_eth_gstrings_stats));
18201817 break;
18211818 }
18221819 }
@@ -1951,9 +1948,10 @@ static void sh_eth_tx_timeout(struct net_device *ndev) · 128 unmodified lines
19511948
19521949 netif_stop_queue(ndev);
19531950
1954− if (netif_msg_timer(mdp))
1955− dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x,"
1956− " resetting...\n", ndev->name, (int)sh_eth_read(ndev, EESR));
1951+ if (netif_msg_timer(mdp)) {
1952+ dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x, resetting...\n",
1953+ ndev->name, (int)sh_eth_read(ndev, EESR));
1954+ }
19571955
19581956 /* tx_errors count up */
19591957 ndev->stats.tx_errors++;
@@ -2086,8 +2084,7 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev) · 126 unmodified lines
20862084 }
20872085
20882086 /* ioctl to device function */
2089−static int sh_eth_do_ioctl(struct net_device *ndev, struct ifreq *rq,
2090− int cmd)
2087+static int sh_eth_do_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
20912088 {
20922089 struct sh_eth_private *mdp = netdev_priv(ndev);
20932090 struct phy_device *phydev = mdp->phydev;
@@ -2342,8 +2339,7 @@ static void sh_eth_set_multicast_list(struct net_device *ndev) · 248 unmodified lines
23422339 unsigned long flags;
23432340
23442341 spin_lock_irqsave(&mdp->lock, flags);
2345− /*
2346− * Initial condition is MCT = 1, PRM = 0.
2342+ /* Initial condition is MCT = 1, PRM = 0.
23472343 * Depending on ndev->flags, set PRM or clear MCT
23482344 */
23492345 ecmr_bits = (sh_eth_read(ndev, ECMR) & ~ECMR_PRM) | ECMR_MCT;
@@ -2409,8 +2405,7 @@ static int sh_eth_vlan_rx_add_vid(struct net_device *ndev, · 59 unmodified lines
24092405
24102406 mdp->vlan_num_ids++;
24112407
2412− /*
2413− * The controller has one VLAN tag HW filter. So, if the filter is
2408+ /* The controller has one VLAN tag HW filter. So, if the filter is
24142409 * already enabled, the driver disables it and the filte
24152410 */
24162411 if (mdp->vlan_num_ids > 1) {
@@ -2526,7 +2521,7 @@ static int sh_mdio_init(struct net_device *ndev, int id, · 109 unmodified lines
25262521 mdp->mii_bus->name = "sh_mii";
25272522 mdp->mii_bus->parent = &ndev->dev;
25282523 snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
2529− mdp->pdev->name, id);
2524+ mdp->pdev->name, id);
25302525
25312526 /* PHY IRQ */
25322527 mdp->mii_bus->irq = devm_kzalloc(&ndev->dev,
@@ -2739,7 +2734,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev) · 206 unmodified lines
27392734
27402735 /* print device information */
27412736 pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
2742− (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
2737+ (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
27432738
27442739 platform_set_drvdata(pdev, ndev);
27452740
@@ -2777,8 +2772,7 @@ static int sh_eth_drv_remove(struct platform_device *pdev) · 31 unmodified lines
27772772 #ifdef CONFIG_PM
27782773 static int sh_eth_runtime_nop(struct device *dev)
27792774 {
2780− /*
2781− * Runtime PM callback shared between ->runtime_suspend()
2775+ /* Runtime PM callback shared between ->runtime_suspend()
27822776 * and ->runtime_resume(). Simply returns success.
27832777 *
27842778 * This driver re-initializes all registers after
drivers/net/ethernet/renesas/sh_eth.h+23−30
@@ -1,5 +1,4 @@
1−/*
2− * SuperH Ethernet device driver
1+/* SuperH Ethernet device driver
32 *
43 * Copyright (C) 2006-2012 Nobuhiro Iwamatsu
54 * Copyright (C) 2008-2012 Renesas Solutions Corp.
@@ -12,9 +11,6 @@ · 6 unmodified lines
1211 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1312 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
1413 * more details.
15− * You should have received a copy of the GNU General Public License along with
16− * this program; if not, write to the Free Software Foundation, Inc.,
17− * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
1814 *
1915 * The full GNU General Public License is included in this distribution in
2016 * the file called "COPYING".
@@ -171,8 +167,7 @@ enum { · 150 unmodified lines
171167 #define SH2_SH3_SKB_RX_ALIGN 2
172168 #endif
173169
174−/*
175− * Register's bits
170+/* Register's bits
176171 */
177172 /* EDSR : sh7734, sh7757, sh7763, and r8a7740 only */
178173 enum EDSR_BIT {
@@ -199,7 +194,7 @@ enum DMAC_T_BIT { · 20 unmodified lines
199194 EDTRR_TRNS_ETHER = 0x01,
200195 };
201196
202−/* EDRRR*/
197+/* EDRRR */
203198 enum EDRRR_R_BIT {
204199 EDRRR_R = 0x01,
205200 };
@@ -422,8 +417,7 @@ enum TSU_FWSLC_BIT { · 216 unmodified lines
422417 #define TSU_VTAG_ENABLE 0x80000000
423418 #define TSU_VTAG_VID_MASK 0x00000fff
424419
425−/*
426− * The sh ether Tx buffer descriptors.
420+/* The sh ether Tx buffer descriptors.
427421 * This structure should be 20 bytes.
428422 */
429423 struct sh_eth_txdesc {
@@ -437,10 +431,9 @@ struct sh_eth_txdesc { · 7 unmodified lines
437431 #endif
438432 u32 addr; /* TD2 */
439433 u32 pad1; /* padding data */
440−} __attribute__((aligned(2), packed));
434+} __aligned(2) __packed;
441435
442−/*
443− * The sh ether Rx buffer descriptors.
436+/* The sh ether Rx buffer descriptors.
444437 * This structure should be 20 bytes.
445438 */
446439 struct sh_eth_rxdesc {
@@ -454,7 +447,7 @@ struct sh_eth_rxdesc { · 7 unmodified lines
454447 #endif
455448 u32 addr; /* RD2 */
456449 u32 pad0; /* padding data */
457−} __attribute__((aligned(2), packed));
450+} __aligned(2) __packed;
458451
459452 /* This structure is used by each CPU dependency handling. */
460453 struct sh_eth_cpu_data {
@@ -480,16 +473,16 @@ struct sh_eth_cpu_data { · 19 unmodified lines
480473 unsigned long eesr_err_check;
481474
482475 /* hardware features */
483− unsigned long irq_flags; /* IRQ configuration flags */
484− unsigned no_psr:1; /* EtherC DO NOT have PSR */
485− unsigned apr:1; /* EtherC have APR */
486− unsigned mpr:1; /* EtherC have MPR */
487− unsigned tpauser:1; /* EtherC have TPAUSER */
488− unsigned bculr:1; /* EtherC have BCULR */
489− unsigned tsu:1; /* EtherC have TSU */
490− unsigned hw_swap:1; /* E-DMAC have DE bit in EDMR */
491− unsigned rpadir:1; /* E-DMAC have RPADIR */
492− unsigned no_trimd:1; /* E-DMAC DO NOT have TRIMD */
476+ unsigned long irq_flags; /* IRQ configuration flags */
477+ unsigned no_psr:1; /* EtherC DO NOT have PSR */
478+ unsigned apr:1; /* EtherC have APR */
479+ unsigned mpr:1; /* EtherC have MPR */
480+ unsigned tpauser:1; /* EtherC have TPAUSER */
481+ unsigned bculr:1; /* EtherC have BCULR */
482+ unsigned tsu:1; /* EtherC have TSU */
483+ unsigned hw_swap:1; /* E-DMAC have DE bit in EDMR */
484+ unsigned rpadir:1; /* E-DMAC have RPADIR */
485+ unsigned no_trimd:1; /* E-DMAC DO NOT have TRIMD */
493486 unsigned no_ade:1; /* E-DMAC DO NOT have ADE bit in EESR */
494487 unsigned hw_crc:1; /* E-DMAC have CSMR */
495488 unsigned select_mii:1; /* EtherC have RMII_MII (MII select register) */
@@ -511,14 +504,14 @@ struct sh_eth_private { · 15 unmodified lines
511504 struct sh_eth_txdesc *tx_ring;
512505 struct sk_buff **rx_skbuff;
513506 struct sk_buff **tx_skbuff;
514− spinlock_t lock;
515− u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */
507+ spinlock_t lock; /* Register access lock */
508+ u32 cur_rx, dirty_rx; /* Producer/consumer ring indices */
516509 u32 cur_tx, dirty_tx;
517− u32 rx_buf_sz; /* Based on MTU+slack. */
510+ u32 rx_buf_sz; /* Based on MTU+slack. */
518511 int edmac_endian;
519512 struct napi_struct napi;
520513 /* MII transceiver section. */
521− u32 phy_id; /* PHY ID */
514+ u32 phy_id; /* PHY ID */
522515 struct mii_bus *mii_bus; /* MDIO bus control */
523516 struct phy_device *phydev; /* PHY device control */
524517 int link;
@@ -526,8 +519,8 @@ struct sh_eth_private { · 1 unmodified line
526519 int msg_enable;
527520 int speed;
528521 int duplex;
529− int port; /* for TSU */
530− int vlan_num_ids; /* for VLAN tag filter */
522+ int port; /* for TSU */
523+ int vlan_num_ids; /* for VLAN tag filter */
531524
532525 unsigned no_ether_link:1;
533526 unsigned ether_link_active_low:1;