]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 21 Sep 2006 04:08:25 +0000 (00:08 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 21 Sep 2006 04:08:25 +0000 (00:08 -0400)
1  2 
drivers/net/lp486e.c
drivers/net/mv643xx_eth.c

diff --combined drivers/net/lp486e.c
index 69ff83101107b672f22346dbc1d4f1af409deaa7,393aba95cf12709e2621f0e070b11612fcf74c36..0258aaca9ed353c5fca43a0160de41bbe5f87120
@@@ -277,7 -277,7 +277,7 @@@ struct i596_rbd 
        phys_addr pa_next;      /* va_to_pa(struct i596_tbd *next) */
        phys_addr pa_data;      /* va_to_pa(char *data) */
        phys_addr pa_prev;      /* va_to_pa(struct i596_tbd *prev) */
 -      
 +
        /* Driver private part */
        struct sk_buff *skb;
  };
@@@ -442,16 -442,16 +442,16 @@@ init_rx_bufs(struct net_device *dev, in
                if (rbd) {
                        rbd->pad = 0;
                        rbd->count = 0;
-                       rbd->skb = dev_alloc_skb(RX_SKB_SIZE);
+                       rbd->skb = dev_alloc_skb(RX_SKBSIZE);
                        if (!rbd->skb) {
                                printk("dev_alloc_skb failed");
                        }
                        rbd->next = rfd->rbd;
                        if (i) {
                                rfd->rbd->prev = rbd;
-                               rbd->size = RX_SKB_SIZE;
+                               rbd->size = RX_SKBSIZE;
                        } else {
-                               rbd->size = (RX_SKB_SIZE | RBD_EL);
+                               rbd->size = (RX_SKBSIZE | RBD_EL);
                                lp->rbd_tail = rbd;
                        }
  
@@@ -647,7 -647,7 +647,7 @@@ init_i596(struct net_device *dev) 
        CA();
  
        barrier();
 -      
 +
        if (lp->scb.command && i596_timeout(dev, "Receive Unit start", 100))
                return 1;
  
@@@ -676,7 -676,7 +676,7 @@@ i596_rx_one(struct net_device *dev, str
                        return 1;
                }
  
 -              skb->dev = dev;         
 +              skb->dev = dev;
                memcpy(skb_put(skb,pkt_len), rfd->data, pkt_len);
  
                skb->protocol = eth_type_trans(skb,dev);
@@@ -797,7 -797,7 +797,7 @@@ static void i596_reset(struct net_devic
        lp->scb.command = CUC_ABORT | RX_ABORT;
        CA();
        barrier();
 -      
 +
        /* wait for shutdown */
        if (lp->scb.command && i596_timeout(dev, "i596_reset(2)", 400))
                ;
@@@ -820,7 -820,7 +820,7 @@@ static void i596_add_cmd(struct net_dev
        cmd->pa_next = I596_NULL;
  
        spin_lock_irqsave(&lp->cmd_lock, flags);
 -      
 +
        if (lp->cmd_head) {
                lp->cmd_tail->pa_next = va_to_pa(cmd);
        } else {
        }
  }
  
 -static int i596_open(struct net_device *dev) 
 +static int i596_open(struct net_device *dev)
  {
        int i;
  
@@@ -875,13 -875,13 +875,13 @@@ static int i596_start_xmit (struct sk_b
        short length;
  
        length = skb->len;
 -      
 +
        if (length < ETH_ZLEN) {
                if (skb_padto(skb, ETH_ZLEN))
                        return 0;
                length = ETH_ZLEN;
        }
 -      
 +
        dev->trans_start = jiffies;
  
        tx_cmd = (struct tx_cmd *) kmalloc ((sizeof (struct tx_cmd) + sizeof (struct i596_tbd)), GFP_ATOMIC);
@@@ -941,7 -941,7 +941,7 @@@ i596_tx_timeout (struct net_device *dev
        netif_wake_queue(dev);
  }
  
 -static void print_eth(char *add) 
 +static void print_eth(char *add)
  {
        int i;
  
@@@ -978,7 -978,7 +978,7 @@@ static int __init lp486e_probe(struct n
  
        lp = (struct i596_private *) dev->priv;
        spin_lock_init(&lp->cmd_lock);
 -      
 +
        /*
         * Do we really have this thing?
         */
@@@ -1132,7 -1132,7 +1132,7 @@@ i596_handle_CU_completion(struct net_de
                default:
                        cmd->pa_next = I596_NULL;
                        lp->last_cmd = jiffies;
 -                      
 +
                }
                barrier();
        }
index 0917a767faf81a4fe63de8195b27c1952d707f49,59de3e74d2d7662de775790ac43bb1542ae041e8..6a74608eb9a3a73d67abe353a27f0ac437a573a4
@@@ -74,7 -74,7 +74,7 @@@ static int ethernet_phy_detect(unsigne
  static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location);
  static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val);
  static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 -static struct ethtool_ops mv643xx_ethtool_ops;
 +static const struct ethtool_ops mv643xx_ethtool_ops;
  
  static char mv643xx_driver_name[] = "mv643xx_eth";
  static char mv643xx_driver_version[] = "1.0";
@@@ -385,7 -385,7 +385,7 @@@ static int mv643xx_eth_receive_queue(st
        struct pkt_info pkt_info;
  
        while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
-               dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE,
+               dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
                                                        DMA_FROM_DEVICE);
                mp->rx_desc_count--;
                received_packets++;
@@@ -2723,7 -2723,7 +2723,7 @@@ static void mv643xx_get_ethtool_stats(s
        eth_update_mib_counters(mp);
  
        for (i = 0; i < MV643XX_STATS_LEN; i++) {
 -              char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;     
 +              char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
                data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
                        sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
        }
@@@ -2766,7 -2766,7 +2766,7 @@@ static int mv643xx_eth_do_ioctl(struct 
        return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL);
  }
  
 -static struct ethtool_ops mv643xx_ethtool_ops = {
 +static const struct ethtool_ops mv643xx_ethtool_ops = {
        .get_settings           = mv643xx_get_settings,
        .set_settings           = mv643xx_set_settings,
        .get_drvinfo            = mv643xx_get_drvinfo,