Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4667ba15 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of /repos/git/net-2.6

parents 5955c7a2 92a0acce

drivers/net/forcedeth.c

+12 −1
Original line number Diff line number Diff line
@@ -6011,9 +6011,20 @@ static void nv_shutdown(struct pci_dev *pdev) 
	if (netif_running(dev))

		nv_close(dev);



	/*

	 * Restore the MAC so a kernel started by kexec won't get confused.

	 * If we really go for poweroff, we must not restore the MAC,

	 * otherwise the MAC for WOL will be reversed at least on some boards.

	 */

	if (system_state != SYSTEM_POWER_OFF) {

		nv_restore_mac_addr(pdev);

	}



	pci_disable_device(pdev);

	/*

	 * Apparently it is not possible to reinitialise from D3 hot,

	 * only put the device into D3 if we really go for poweroff.

	 */

	if (system_state == SYSTEM_POWER_OFF) {

		if (pci_enable_wake(pdev, PCI_D3cold, np->wolenabled))

			pci_enable_wake(pdev, PCI_D3hot, np->wolenabled);

include/linux/skbuff.h

+0 −9
Original line number Diff line number Diff line
@@ -416,15 +416,6 @@ extern void skb_over_panic(struct sk_buff *skb, int len, 
				     void *here);

extern void	      skb_under_panic(struct sk_buff *skb, int len,

				      void *here);

extern void	      skb_truesize_bug(struct sk_buff *skb);



static inline void skb_truesize_check(struct sk_buff *skb)

{

	int len = sizeof(struct sk_buff) + skb->len;



	if (unlikely((int)skb->truesize < len))

		skb_truesize_bug(skb);

}



extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,

			int getfrag(void *from, char *to, int offset,

include/net/sock.h

+0 −1
Original line number Diff line number Diff line
@@ -860,7 +860,6 @@ static inline void sk_mem_uncharge(struct sock *sk, int size) 


static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb)

{

	skb_truesize_check(skb);

	sock_set_flag(sk, SOCK_QUEUE_SHRUNK);

	sk->sk_wmem_queued -= skb->truesize;

	sk_mem_uncharge(sk, skb->truesize);

net/core/skbuff.c

+0 −8
Original line number Diff line number Diff line
@@ -143,14 +143,6 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) 
	BUG();

}



void skb_truesize_bug(struct sk_buff *skb)

{

	WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) "

	       "len=%u, sizeof(sk_buff)=%Zd\n",

	       skb->truesize, skb->len, sizeof(struct sk_buff));

}

EXPORT_SYMBOL(skb_truesize_bug);



/* 	Allocate a new skbuff. We do this ourselves so we can fill in a few

 *	'private' fields and also do memory statistics to find all the

 *	[BEEP] leaks.

net/core/sock.c

+0 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,6 @@ void sock_rfree(struct sk_buff *skb) 
{

	struct sock *sk = skb->sk;



	skb_truesize_check(skb);

	atomic_sub(skb->truesize, &sk->sk_rmem_alloc);

	sk_mem_uncharge(skb->sk, skb->truesize);

}