Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2 files changed, 7 insertions, 13 deletions

diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 0cded04680..821c81e8cd 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -1511,8 +1511,8 @@ static inline short setup_idle_tx_channel (hrz_dev * dev, hrz_vcc * vcc) {
     // a.k.a. prepare the channel and remember that we have done so.
     
     tx_ch_desc * tx_desc = &memmap->tx_descs[tx_channel];
-    u16 rd_ptr;
-    u16 wr_ptr;
+    u32 rd_ptr;
+    u32 wr_ptr;
     u16 channel = vcc->channel;
     
     unsigned long flags;
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 8f46427166..49fa1e4413 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -2707,7 +2707,7 @@ bnx2_init_nvram(struct bnx2 *bp)
 
         if (j == entry_count) {
                 bp->flash_info = NULL;
-                printk(KERN_ALERT "Unknown flash/EEPROM type.\n");
+                printk(KERN_ALERT PFX "Unknown flash/EEPROM type.\n");
                 rc = -ENODEV;
         }
 
@@ -3903,6 +3903,8 @@ bnx2_test_loopback(struct bnx2 *bp)
 
         pkt_size = 1514;
         skb = dev_alloc_skb(pkt_size);
+        if (!skb)
+                return -ENOMEM;
         packet = skb_put(skb, pkt_size);
         memcpy(packet, bp->mac_addr, 6);
         memset(packet + 6, 0x0, 8);
@@ -4798,11 +4800,7 @@ bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
         struct bnx2 *bp = dev->priv;
         int rc;
 
-        if (eeprom->offset > bp->flash_info->total_size)
-                return -EINVAL;
-
-        if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
-                eeprom->len = bp->flash_info->total_size - eeprom->offset;
+        /* parameters already validated in ethtool_get_eeprom */
 
         rc = bnx2_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
 
@@ -4816,11 +4814,7 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
         struct bnx2 *bp = dev->priv;
         int rc;
 
-        if (eeprom->offset > bp->flash_info->total_size)
-                return -EINVAL;
-
-        if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
-                eeprom->len = bp->flash_info->total_size - eeprom->offset;
+        /* parameters already validated in ethtool_set_eeprom */
 
         rc = bnx2_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);