Fix naming conflict with pcnet32 net driver and ethtool,

by cleaning up the pcnet32 namespace a bit.

s/PORT_/PCNET32_PORT_/ for local constants, to avoid conflicting
with linux/ethtool.h.

Contributor: William Lee Irwin III

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 25b86ec8953870d90a40c5ef45584fdbd3e6729f..8dd2af654ba15954eadd14ffbe48ca69d821186d 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -65,15 +65,15 @@ static struct net_device *pcnet32_dev;
 static const int max_interrupt_work = 80;
 static const int rx_copybreak = 200;
 
-#define PORT_AUI      0x00
-#define PORT_10BT     0x01
-#define PORT_GPSI     0x02
-#define PORT_MII      0x03
+#define PCNET32_PORT_AUI      0x00
+#define PCNET32_PORT_10BT     0x01
+#define PCNET32_PORT_GPSI     0x02
+#define PCNET32_PORT_MII      0x03
 
-#define PORT_PORTSEL  0x03
-#define PORT_ASEL     0x04
-#define PORT_100      0x40
-#define PORT_FD              0x80
+#define PCNET32_PORT_PORTSEL  0x03
+#define PCNET32_PORT_ASEL     0x04
+#define PCNET32_PORT_100      0x40
+#define PCNET32_PORT_FD              0x80
 
 #define PCNET32_DMA_MASK 0xffffffff
 
@@ -82,22 +82,22 @@ static const int rx_copybreak = 200;
  * to internal options
  */
 static unsigned char options_mapping[] = {
-    PORT_ASEL,                    /*  0 Auto-select      */
-    PORT_AUI,                     /*  1 BNC/AUI          */
-    PORT_AUI,                     /*  2 AUI/BNC          */ 
-    PORT_ASEL,                    /*  3 not supported    */
-    PORT_10BT | PORT_FD,          /*  4 10baseT-FD       */
-    PORT_ASEL,                    /*  5 not supported    */
-    PORT_ASEL,                    /*  6 not supported    */
-    PORT_ASEL,                    /*  7 not supported    */
-    PORT_ASEL,                    /*  8 not supported    */
-    PORT_MII,                     /*  9 MII 10baseT      */
-    PORT_MII | PORT_FD,                   /* 10 MII 10baseT-FD   */
-    PORT_MII,                     /* 11 MII (autosel)    */
-    PORT_10BT,                    /* 12 10BaseT          */
-    PORT_MII | PORT_100,          /* 13 MII 100BaseTx    */
-    PORT_MII | PORT_100 | PORT_FD, /* 14 MII 100BaseTx-FD */
-    PORT_ASEL                     /* 15 not supported    */
+    PCNET32_PORT_ASEL,                    /*  0 Auto-select      */
+    PCNET32_PORT_AUI,                     /*  1 BNC/AUI          */
+    PCNET32_PORT_AUI,                     /*  2 AUI/BNC          */ 
+    PCNET32_PORT_ASEL,                    /*  3 not supported    */
+    PCNET32_PORT_10BT | PCNET32_PORT_FD,          /*  4 10baseT-FD       */
+    PCNET32_PORT_ASEL,                    /*  5 not supported    */
+    PCNET32_PORT_ASEL,                    /*  6 not supported    */
+    PCNET32_PORT_ASEL,                    /*  7 not supported    */
+    PCNET32_PORT_ASEL,                    /*  8 not supported    */
+    PCNET32_PORT_MII,                     /*  9 MII 10baseT      */
+    PCNET32_PORT_MII | PCNET32_PORT_FD,                   /* 10 MII 10baseT-FD   */
+    PCNET32_PORT_MII,                     /* 11 MII (autosel)    */
+    PCNET32_PORT_10BT,                    /* 12 10BaseT          */
+    PCNET32_PORT_MII | PCNET32_PORT_100,          /* 13 MII 100BaseTx    */
+    PCNET32_PORT_MII | PCNET32_PORT_100 | PCNET32_PORT_FD, /* 14 MII 100BaseTx-FD */
+    PCNET32_PORT_ASEL                     /* 15 not supported    */
 };
 
 #define MAX_UNITS 8
@@ -709,12 +709,12 @@ pcnet32_probe1(unsigned long ioaddr, unsigned char irq_line, int shared, int car
     lp->ltint = ltint;
     lp->mii = mii;
     if (options[card_idx] > sizeof (options_mapping))
-       lp->options = PORT_ASEL;
+       lp->options = PCNET32_PORT_ASEL;
     else
        lp->options = options_mapping[options[card_idx]];
     
-    if (fdx && !(lp->options & PORT_ASEL) && full_duplex[card_idx])
-       lp->options |= PORT_FD;
+    if (fdx && !(lp->options & PCNET32_PORT_ASEL) && full_duplex[card_idx])
+       lp->options |= PCNET32_PORT_FD;
     
     if (a == NULL) {
       printk(KERN_ERR "pcnet32: No access methods\n");
@@ -726,7 +726,7 @@ pcnet32_probe1(unsigned long ioaddr, unsigned char irq_line, int shared, int car
     
     /* detect special T1/E1 WAN card by checking for MAC address */
     if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0 && dev->dev_addr[2] == 0x75)
-       lp->options = PORT_FD | PORT_GPSI;
+       lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
 
     lp->init_block.mode = le16_to_cpu(0x0003); /* Disable Rx and Tx. */
     lp->init_block.tlen_rlen = le16_to_cpu(TX_RING_LEN_BITS | RX_RING_LEN_BITS); 
@@ -829,16 +829,16 @@ pcnet32_open(struct net_device *dev)
     
     /* set/reset autoselect bit */
     val = lp->a.read_bcr (ioaddr, 2) & ~2;
-    if (lp->options & PORT_ASEL)
+    if (lp->options & PCNET32_PORT_ASEL)
        val |= 2;
     lp->a.write_bcr (ioaddr, 2, val);
     
     /* handle full duplex setting */
     if (lp->full_duplex) {
        val = lp->a.read_bcr (ioaddr, 9) & ~3;
-       if (lp->options & PORT_FD) {
+       if (lp->options & PCNET32_PORT_FD) {
            val |= 1;
-           if (lp->options == (PORT_FD | PORT_AUI))
+           if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
                val |= 2;
        }
        lp->a.write_bcr (ioaddr, 9, val);
@@ -846,19 +846,19 @@ pcnet32_open(struct net_device *dev)
     
     /* set/reset GPSI bit in test register */
     val = lp->a.read_csr (ioaddr, 124) & ~0x10;
-    if ((lp->options & PORT_PORTSEL) == PORT_GPSI)
+    if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
        val |= 0x10;
     lp->a.write_csr (ioaddr, 124, val);
     
-    if (lp->mii && !(lp->options & PORT_ASEL)) {
+    if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
        val = lp->a.read_bcr (ioaddr, 32) & ~0x38; /* disable Auto Negotiation, set 10Mpbs, HD */
-       if (lp->options & PORT_FD)
+       if (lp->options & PCNET32_PORT_FD)
            val |= 0x10;
-       if (lp->options & PORT_100)
+       if (lp->options & PCNET32_PORT_100)
            val |= 0x08;
        lp->a.write_bcr (ioaddr, 32, val);
     } else {
-       if (lp->options & PORT_ASEL) {  /* enable auto negotiate, setup, disable fd */
+       if (lp->options & PCNET32_PORT_ASEL) {  /* enable auto negotiate, setup, disable fd */
                val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
                val |= 0x20;
                lp->a.write_bcr(ioaddr, 32, val);
@@ -878,7 +878,7 @@ pcnet32_open(struct net_device *dev)
        lp->a.write_csr (ioaddr, 5, val);
     }
    
-    lp->init_block.mode = le16_to_cpu((lp->options & PORT_PORTSEL) << 7);
+    lp->init_block.mode = le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
     lp->init_block.filter[0] = 0x00000000;
     lp->init_block.filter[1] = 0x00000000;
     if (pcnet32_init_ring(dev))
@@ -1465,9 +1465,9 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
     if (dev->flags&IFF_PROMISC) {
        /* Log any net taps. */
        printk(KERN_INFO "%s: Promiscuous mode enabled.\n", dev->name);
-       lp->init_block.mode = le16_to_cpu(0x8000 | (lp->options & PORT_PORTSEL) << 7);
+       lp->init_block.mode = le16_to_cpu(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) << 7);
     } else {
-       lp->init_block.mode = le16_to_cpu((lp->options & PORT_PORTSEL) << 7);
+       lp->init_block.mode = le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
        pcnet32_load_multicast (dev);
     }