Commit e9022ee6 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes'

parents 5f4f9dc1 be0df20c

drivers/net/b44.c

+9 −4
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 


#define DRV_MODULE_NAME		"b44"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"0.96"

#define DRV_MODULE_RELDATE	"Nov 8, 2005"

#define DRV_MODULE_VERSION	"0.97"

#define DRV_MODULE_RELDATE	"Nov 30, 2005"



#define B44_DEF_MSG_ENABLE	  \

	(NETIF_MSG_DRV		| \
@@ -1417,6 +1417,7 @@ static int b44_open(struct net_device *dev) 
	add_timer(&bp->timer);



	b44_enable_ints(bp);

	netif_start_queue(dev);

out:

	return err;

}
@@ -1837,12 +1838,15 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
{

	struct mii_ioctl_data *data = if_mii(ifr);

	struct b44 *bp = netdev_priv(dev);

	int err;

	int err = -EINVAL;



	if (!netif_running(dev))

		goto out;



	spin_lock_irq(&bp->lock);

	err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL);

	spin_unlock_irq(&bp->lock);



out:

	return err;

}
@@ -2113,6 +2117,7 @@ static int b44_resume(struct pci_dev *pdev) 
	add_timer(&bp->timer);



	b44_enable_ints(bp);

	netif_wake_queue(dev);

	return 0;

}

drivers/net/e1000/e1000_main.c

+1 −13
Original line number Diff line number Diff line
@@ -2621,19 +2621,7 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb) 
			  E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) )

			return 0;

	}

	if(htons(ETH_P_IP) == skb->protocol) {

		const struct iphdr *ip = skb->nh.iph;

		if(IPPROTO_UDP == ip->protocol) {

			struct udphdr *udp = (struct udphdr *)(skb->h.uh);

			if(ntohs(udp->dest) == 67) {

				offset = (uint8_t *)udp + 8 - skb->data;

				length = skb->len - offset;



				return e1000_mng_write_dhcp_info(hw,

						(uint8_t *)udp + 8, length);

			}

		}

	} else if((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) {

 	if ((skb->len > MINIMUM_DHCP_PACKET_SIZE) && (!skb->protocol)) {

		struct ethhdr *eth = (struct ethhdr *) skb->data;

		if((htons(ETH_P_IP) == eth->h_proto)) {

			const struct iphdr *ip =

drivers/net/sk98lin/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ sk98lin-objs := \ 
		sktimer.o	\

		skvpd.o		\

		skxmac2.o	\

		skproc.o	\

		skcsum.o

		skproc.o



# DBGDEF =  \

# -DDEBUG
@@ -77,7 +76,7 @@ endif 
# SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources

# SK_DBGCAT_DRV_EVENT           0x08000000      driver events



EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)

EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)



clean:

	rm -f core *.o *.a *.s

drivers/net/sk98lin/h/skdrv2nd.h

+0 −4
Original line number Diff line number Diff line
@@ -424,10 +424,6 @@ struct s_AC { 
	TX_PORT		TxPort[SK_MAX_MACS][2];

	RX_PORT		RxPort[SK_MAX_MACS];



	unsigned int	CsOfs1;		/* for checksum calculation */

	unsigned int	CsOfs2;		/* for checksum calculation */

	SK_U32		CsOfs;		/* for checksum calculation */



	SK_BOOL		CheckQueue;	/* check event queue soon */

	SK_TIMER        DrvCleanupTimer;/* to check for pending descriptors */

	DIM_INFO        DynIrqModInfo;  /* all data related to DIM */

drivers/net/sk98lin/skcsum.c

deleted100644 → 0
+0 −871

File deleted.

Preview size limit exceeded, changes collapsed.