Commit 3feeba1e 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: (95 commits)
  b44: GFP_DMA skb should not escape from driver
  korina: do not use IRQF_SHARED with IRQF_DISABLED
  korina: do not stop queue here
  korina: fix handling tx_chain_tail
  korina: do tx at the right position
  korina: do schedule napi after testing for it
  korina: rework korina_rx() for use with napi
  korina: disable napi on close and restart
  korina: reset resource buffer size to 1536
  korina: fix usage of driver_data
  bnx2x: First slow path interrupt race
  bnx2x: MTU Filter
  bnx2x: Indirection table initialization index
  bnx2x: Missing brackets
  bnx2x: Fixing the doorbell size
  bnx2x: Endianness issues
  bnx2x: VLAN tagged packets without VLAN offload
  bnx2x: Protecting the link change indication
  bnx2x: Flow control updated before reporting the link
  bnx2x: Missing mask when calculating flow control
  ...
parents 7e92214b a58c891a

drivers/isdn/i4l/isdn_net.c

+3 −6
Original line number Diff line number Diff line
@@ -292,7 +292,9 @@ isdn_net_unbind_channel(isdn_net_local * lp) 
	lp->dialstate = 0;

	dev->rx_netdev[isdn_dc2minor(lp->isdn_device, lp->isdn_channel)] = NULL;

	dev->st_netdev[isdn_dc2minor(lp->isdn_device, lp->isdn_channel)] = NULL;

	isdn_free_channel(lp->isdn_device, lp->isdn_channel, ISDN_USAGE_NET);

	if (lp->isdn_device != -1 && lp->isdn_channel != -1)

		isdn_free_channel(lp->isdn_device, lp->isdn_channel,

				  ISDN_USAGE_NET);

	lp->flags &= ~ISDN_NET_CONNECTED;

	lp->isdn_device = -1;

	lp->isdn_channel = -1;
@@ -2513,7 +2515,6 @@ static const struct net_device_ops isdn_netdev_ops = { 
	.ndo_stop	      = isdn_net_close,

	.ndo_do_ioctl	      = isdn_net_ioctl,



	.ndo_validate_addr    = NULL,

	.ndo_start_xmit	      = isdn_net_start_xmit,

	.ndo_get_stats	      = isdn_net_get_stats,

	.ndo_tx_timeout	      = isdn_net_tx_timeout,
@@ -2528,12 +2529,8 @@ static void _isdn_setup(struct net_device *dev) 


	ether_setup(dev);



	dev->flags = IFF_NOARP | IFF_POINTOPOINT;

	/* Setup the generic properties */

	dev->mtu = 1500;

	dev->flags = IFF_NOARP|IFF_POINTOPOINT;

	dev->type = ARPHRD_ETHER;

	dev->addr_len = ETH_ALEN;

	dev->header_ops = NULL;

	dev->netdev_ops = &isdn_netdev_ops;

drivers/net/arm/etherh.c

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static const struct net_device_ops etherh_netdev_ops = { 
	.ndo_get_stats		= ei_get_stats,

	.ndo_set_multicast_list = ei_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_addr	= eth_set_mac_addr,

	.ndo_set_mac_address	= eth_set_mac_addr,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ei_poll,

drivers/net/ax88796.c

+21 −6
Original line number Diff line number Diff line
@@ -37,7 +37,10 @@ static int phy_debug = 0; 
#define __ei_open       ax_ei_open

#define __ei_close      ax_ei_close

#define __ei_poll	ax_ei_poll

#define __ei_start_xmit ax_ei_start_xmit

#define __ei_tx_timeout ax_ei_tx_timeout

#define __ei_get_stats  ax_ei_get_stats

#define __ei_set_multicast_list ax_ei_set_multicast_list

#define __ei_interrupt  ax_ei_interrupt

#define ____alloc_ei_netdev ax__alloc_ei_netdev

#define __NS8390_init   ax_NS8390_init
@@ -623,6 +626,23 @@ static void ax_eeprom_register_write(struct eeprom_93cx6 *eeprom) 
}

#endif



static const struct net_device_ops ax_netdev_ops = {

	.ndo_open		= ax_open,

	.ndo_stop		= ax_close,

	.ndo_do_ioctl		= ax_ioctl,



	.ndo_start_xmit		= ax_ei_start_xmit,

	.ndo_tx_timeout		= ax_ei_tx_timeout,

	.ndo_get_stats		= ax_ei_get_stats,

	.ndo_set_multicast_list = ax_ei_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ax_ei_poll,

#endif

};



/* setup code */



static void ax_initial_setup(struct net_device *dev, struct ei_device *ei_local)
@@ -738,9 +758,7 @@ static int ax_init_dev(struct net_device *dev, int first_init) 
	ei_status.get_8390_hdr	= &ax_get_8390_hdr;

	ei_status.priv = 0;



	dev->open		= ax_open;

	dev->stop		= ax_close;

	dev->do_ioctl		= ax_ioctl;

	dev->netdev_ops		= &ax_netdev_ops;

	dev->ethtool_ops	= &ax_ethtool_ops;



	ax->msg_enable		= NETIF_MSG_LINK;
@@ -753,9 +771,6 @@ static int ax_init_dev(struct net_device *dev, int first_init) 
	ax->mii.mdio_write	= ax_phy_write;

	ax->mii.dev		= dev;



#ifdef CONFIG_NET_POLL_CONTROLLER

	dev->poll_controller = ax_ei_poll;

#endif

	ax_NS8390_init(dev, 0);



	if (first_init)

drivers/net/b44.c

+3 −1
Original line number Diff line number Diff line
@@ -679,6 +679,7 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked) 
			dev_kfree_skb_any(skb);

			return -ENOMEM;

		}

		bp->force_copybreak = 1;

	}



	rh = (struct rx_header *) skb->data;
@@ -800,7 +801,7 @@ static int b44_rx(struct b44 *bp, int budget) 
		/* Omit CRC. */

		len -= 4;



		if (len > RX_COPY_THRESHOLD) {

		if (!bp->force_copybreak && len > RX_COPY_THRESHOLD) {

			int skb_size;

			skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);

			if (skb_size < 0)
@@ -2152,6 +2153,7 @@ static int __devinit b44_init_one(struct ssb_device *sdev, 
	bp = netdev_priv(dev);

	bp->sdev = sdev;

	bp->dev = dev;

	bp->force_copybreak = 0;



	bp->msg_enable = netif_msg_init(b44_debug, B44_DEF_MSG_ENABLE);

drivers/net/b44.h

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ struct b44 { 
	u32			rx_pending;

	u32			tx_pending;

	u8			phy_addr;



	u8			force_copybreak;

	struct mii_if_info	mii_if;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE