aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/hp100.c2
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c2
-rw-r--r--drivers/net/sk98lin/skdim.c2
-rw-r--r--drivers/net/sk98lin/skge.c2
-rw-r--r--drivers/net/sk98lin/skgepnmi.c8
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index e92c17f6931c..55c7ed608391 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -276,7 +276,7 @@ static void hp100_RegisterDump(struct net_device *dev);
276 * Convert an address in a kernel buffer to a bus/phys/dma address. 276 * Convert an address in a kernel buffer to a bus/phys/dma address.
277 * This work *only* for memory fragments part of lp->page_vaddr, 277 * This work *only* for memory fragments part of lp->page_vaddr,
278 * because it was properly DMA allocated via pci_alloc_consistent(), 278 * because it was properly DMA allocated via pci_alloc_consistent(),
279 * so we just need to "retreive" the original mapping to bus/phys/dma 279 * so we just need to "retrieve" the original mapping to bus/phys/dma
280 * address - Jean II */ 280 * address - Jean II */
281static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr) 281static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr)
282{ 282{
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 049c34b37067..593d8adee891 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1598,7 +1598,7 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1598 switch(cmd) { 1598 switch(cmd) {
1599 case SIOCGMIIPHY: /* Get the address of the PHY in use. */ 1599 case SIOCGMIIPHY: /* Get the address of the PHY in use. */
1600 data[0] = 0; /* we have only this address */ 1600 data[0] = 0; /* we have only this address */
1601 /* fall trough */ 1601 /* fall through */
1602 case SIOCGMIIREG: /* Read the specified MII register. */ 1602 case SIOCGMIIREG: /* Read the specified MII register. */
1603 data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f); 1603 data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
1604 break; 1604 break;
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c
index 0fddf61047b4..07c1b4c8699d 100644
--- a/drivers/net/sk98lin/skdim.c
+++ b/drivers/net/sk98lin/skdim.c
@@ -180,7 +180,7 @@ SkDimModerate(SK_AC *pAC) {
180 /* 180 /*
181 ** The number of interrupts per sec is the same as expected. 181 ** The number of interrupts per sec is the same as expected.
182 ** Evalulate the descriptor-ratio. If it has changed, a resize 182 ** Evalulate the descriptor-ratio. If it has changed, a resize
183 ** in the moderation timer might be usefull 183 ** in the moderation timer might be useful
184 */ 184 */
185 if (M_DIMINFO.AutoSizing) { 185 if (M_DIMINFO.AutoSizing) {
186 ResizeDimTimerDuration(pAC); 186 ResizeDimTimerDuration(pAC);
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 197edd74fbb5..a5f2b1ee0752 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -2851,7 +2851,7 @@ unsigned long Flags; /* for spin lock */
2851 * Description: 2851 * Description:
2852 * This function is called if an ioctl is issued on the device. 2852 * This function is called if an ioctl is issued on the device.
2853 * There are three subfunction for reading, writing and test-writing 2853 * There are three subfunction for reading, writing and test-writing
2854 * the private MIB data structure (usefull for SysKonnect-internal tools). 2854 * the private MIB data structure (useful for SysKonnect-internal tools).
2855 * 2855 *
2856 * Returns: 2856 * Returns:
2857 * 0, if everything is ok 2857 * 0, if everything is ok
diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c
index 58e1a5be913f..a386172107e8 100644
--- a/drivers/net/sk98lin/skgepnmi.c
+++ b/drivers/net/sk98lin/skgepnmi.c
@@ -611,7 +611,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */
611 * Description: 611 * Description:
612 * Calls a general sub-function for all this stuff. The preset does 612 * Calls a general sub-function for all this stuff. The preset does
613 * the same as a set, but returns just before finally setting the 613 * the same as a set, but returns just before finally setting the
614 * new value. This is usefull to check if a set might be successfull. 614 * new value. This is useful to check if a set might be successfull.
615 * If the instance -1 is passed, an array of values is supposed and 615 * If the instance -1 is passed, an array of values is supposed and
616 * all instances of the OID will be set. 616 * all instances of the OID will be set.
617 * 617 *
@@ -654,7 +654,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */
654 * Description: 654 * Description:
655 * Calls a general sub-function for all this stuff. The preset does 655 * Calls a general sub-function for all this stuff. The preset does
656 * the same as a set, but returns just before finally setting the 656 * the same as a set, but returns just before finally setting the
657 * new value. This is usefull to check if a set might be successfull. 657 * new value. This is useful to check if a set might be successfull.
658 * If the instance -1 is passed, an array of values is supposed and 658 * If the instance -1 is passed, an array of values is supposed and
659 * all instances of the OID will be set. 659 * all instances of the OID will be set.
660 * 660 *
@@ -870,7 +870,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */
870 * Description: 870 * Description:
871 * Calls a general sub-function for all this set stuff. The preset does 871 * Calls a general sub-function for all this set stuff. The preset does
872 * the same as a set, but returns just before finally setting the 872 * the same as a set, but returns just before finally setting the
873 * new value. This is usefull to check if a set might be successfull. 873 * new value. This is useful to check if a set might be successfull.
874 * The sub-function runs through the IdTable, checks which OIDs are able 874 * The sub-function runs through the IdTable, checks which OIDs are able
875 * to set, and calls the handler function of the OID to perform the 875 * to set, and calls the handler function of the OID to perform the
876 * preset. The return value of the function will also be stored in 876 * preset. The return value of the function will also be stored in
@@ -6473,7 +6473,7 @@ unsigned int PhysPortIndex) /* Physical port index */
6473 * 6473 *
6474 * Description: 6474 * Description:
6475 * The COMMON module only tells us if the mode is half or full duplex. 6475 * The COMMON module only tells us if the mode is half or full duplex.
6476 * But in the decade of auto sensing it is usefull for the user to 6476 * But in the decade of auto sensing it is useful for the user to
6477 * know if the mode was negotiated or forced. Therefore we have a 6477 * know if the mode was negotiated or forced. Therefore we have a
6478 * look to the mode, which was last used by the negotiation process. 6478 * look to the mode, which was last used by the negotiation process.
6479 * 6479 *