Commit ae42d8d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ehea: Fix a checksum issue on the receive path
  net: allow FEC driver to use fixed PHY support
  tg3: restore rx_dropped accounting
  b44: fix carrier detection on bind
  net: clear heap allocations for privileged ethtool actions
  NET: wimax, fix use after free
  ATM: iphase, remove sleep-inside-atomic
  ATM: mpc, fix use after free
  ATM: solos-pci, remove use after free
  net/fec: carrier off initially to avoid root mount failure
  r8169: use device model DMA API
  r8169: allocate with GFP_KERNEL flag when able to sleep
parents 0eead9ab 71085ce8

drivers/atm/iphase.c

+0 −6
Original line number Diff line number Diff line
@@ -3156,7 +3156,6 @@ static int __devinit ia_init_one(struct pci_dev *pdev, 
{  

	struct atm_dev *dev;  

	IADEV *iadev;  

        unsigned long flags;

	int ret;



	iadev = kzalloc(sizeof(*iadev), GFP_KERNEL);
@@ -3188,19 +3187,14 @@ static int __devinit ia_init_one(struct pci_dev *pdev, 
	ia_dev[iadev_count] = iadev;

	_ia_dev[iadev_count] = dev;

	iadev_count++;

	spin_lock_init(&iadev->misc_lock);

	/* First fixes first. I don't want to think about this now. */

	spin_lock_irqsave(&iadev->misc_lock, flags); 

	if (ia_init(dev) || ia_start(dev)) {  

		IF_INIT(printk("IA register failed!\n");)

		iadev_count--;

		ia_dev[iadev_count] = NULL;

		_ia_dev[iadev_count] = NULL;

		spin_unlock_irqrestore(&iadev->misc_lock, flags); 

		ret = -EINVAL;

		goto err_out_deregister_dev;

	}

	spin_unlock_irqrestore(&iadev->misc_lock, flags); 

	IF_EVENT(printk("iadev_count = %d\n", iadev_count);)



	iadev->next_board = ia_boards;

drivers/atm/iphase.h

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ typedef struct iadev_t { 
	struct dle_q rx_dle_q;  

	struct free_desc_q *rx_free_desc_qhead;  

	struct sk_buff_head rx_dma_q;  

        spinlock_t rx_lock, misc_lock;

	spinlock_t rx_lock;

	struct atm_vcc **rx_open;	/* list of all open VCs */  

        u16 num_rx_desc, rx_buf_sz, rxing;

        u32 rx_pkt_ram, rx_tmp_cnt;

drivers/atm/solos-pci.c

+5 −3
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr, 
	struct atm_dev *atmdev = container_of(dev, struct atm_dev, class_dev);

	struct solos_card *card = atmdev->dev_data;

	struct sk_buff *skb;

	unsigned int len;



	spin_lock(&card->cli_queue_lock);

	skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]);
@@ -451,11 +452,12 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr, 
	if(skb == NULL)

		return sprintf(buf, "No data.\n");



	memcpy(buf, skb->data, skb->len);

	dev_dbg(&card->dev->dev, "len: %d\n", skb->len);

	len = skb->len;

	memcpy(buf, skb->data, len);

	dev_dbg(&card->dev->dev, "len: %d\n", len);



	kfree_skb(skb);

	return skb->len;

	return len;

}



static int send_command(struct solos_card *card, int dev, const char *buf, size_t size)

drivers/net/b44.c

+2 −2
Original line number Diff line number Diff line
@@ -2170,8 +2170,6 @@ static int __devinit b44_init_one(struct ssb_device *sdev, 
	dev->irq = sdev->irq;

	SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);



	netif_carrier_off(dev);



	err = ssb_bus_powerup(sdev->bus, 0);

	if (err) {

		dev_err(sdev->dev,
@@ -2213,6 +2211,8 @@ static int __devinit b44_init_one(struct ssb_device *sdev, 
		goto err_out_powerdown;

	}



	netif_carrier_off(dev);



	ssb_set_drvdata(sdev, dev);



	/* Chip reset provides power to the b44 MAC & PCI cores, which

drivers/net/ehea/ehea_main.c

+8 −1
Original line number Diff line number Diff line
@@ -533,8 +533,15 @@ static inline void ehea_fill_skb(struct net_device *dev, 
	int length = cqe->num_bytes_transfered - 4;	/*remove CRC */



	skb_put(skb, length);

	skb->ip_summed = CHECKSUM_UNNECESSARY;

	skb->protocol = eth_type_trans(skb, dev);



	/* The packet was not an IPV4 packet so a complemented checksum was

	   calculated. The value is found in the Internet Checksum field. */

	if (cqe->status & EHEA_CQE_BLIND_CKSUM) {

		skb->ip_summed = CHECKSUM_COMPLETE;

		skb->csum = csum_unfold(~cqe->inet_checksum_value);

	} else

		skb->ip_summed = CHECKSUM_UNNECESSARY;

}



static inline struct sk_buff *get_skb_by_index(struct sk_buff **skb_array,

CRA Git | Maintained and supported by SUSTech CRA and CCSE