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

Commit 826509f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents d992895b c530cfb1

Documentation/feature-removal-schedule.txt

+12 −0
Original line number Diff line number Diff line
@@ -135,3 +135,15 @@ Why: With the 16-bit PCMCIA subsystem now behaving (almost) like a 
	pcmciautils package available at

	http://kernel.org/pub/linux/utils/kernel/pcmcia/

Who:	Dominik Brodowski <linux@brodo.de>



---------------------------



What:	ip_queue and ip6_queue (old ipv4-only and ipv6-only netfilter queue)

When:	December 2005

Why:	This interface has been obsoleted by the new layer3-independent

	"nfnetlink_queue".  The Kernel interface is compatible, so the old

	ip[6]tables "QUEUE" targets still work and will transparently handle

	all packets into nfnetlink queue number 0.  Userspace users will have

	to link against API-compatible library on top of libnfnetlink_queue 

	instead of the current 'libipq'.

Who:	Harald Welte <laforge@netfilter.org>

drivers/atm/ambassador.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) { 
	  

	  // VC layer stats

	  atomic_inc(&atm_vcc->stats->rx);

	  do_gettimeofday(&skb->stamp);

	  __net_timestamp(skb);

	  // end of our responsability

	  atm_vcc->push (atm_vcc, skb);

	  return;

drivers/atm/atmtcp.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb) 
		result = -ENOBUFS;

		goto done;

	}

	do_gettimeofday(&new_skb->stamp);

	__net_timestamp(new_skb);

	memcpy(skb_put(new_skb,skb->len),skb->data,skb->len);

	out_vcc->push(out_vcc,new_skb);

	atomic_inc(&vcc->stats->tx);

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static int rx_aal0(struct atm_vcc *vcc) 
		return 0;

	}

	skb_put(skb,length);

	skb->stamp = eni_vcc->timestamp;

	skb_set_timestamp(skb, &eni_vcc->timestamp);

	DPRINTK("got len %ld\n",length);

	if (do_rx_dma(vcc,skb,1,length >> 2,length >> 2)) return 1;

	eni_vcc->rxing++;

drivers/atm/firestream.c

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q) 
				skb_put (skb, qe->p1 & 0xffff); 

				ATM_SKB(skb)->vcc = atm_vcc;

				atomic_inc(&atm_vcc->stats->rx);

				do_gettimeofday(&skb->stamp);

				__net_timestamp(skb);

				fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);

				atm_vcc->push (atm_vcc, skb);

				fs_dprintk (FS_DEBUG_ALLOC, "Free rec-d: %p\n", pe);