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

Commit 6f37ac79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: rt_check_expire() can take a long time, add a cond_resched()
  [ISDN] sc: Really, really fix warning
  [ISDN] sc: Fix sndpkt to have the correct number of arguments
  [TCP] FRTO: Clear frto_highmark only after process_frto that uses it
  [NET]: Remove notifier block from chain when register_netdevice_notifier fails
  [FS_ENET]: Fix module build.
  [TCP]: Make sure write_queue_from does not begin with NULL ptr
  [TCP]: Fix size calculation in sk_stream_alloc_pskb
  [S2IO]: Fixed memory leak when MSI-X vector allocation fails
  [BONDING]: Fix resource use after free
  [SYSCTL]: Fix warning for token-ring from sysctl checker
  [NET] random : secure_tcp_sequence_number should not assume CONFIG_KTIME_SCALAR
  [IWLWIFI]: Not correctly dealing with hotunplug.
  [TCP] FRTO: Plug potential LOST-bit leak
  [TCP] FRTO: Limit snd_cwnd if TCP was application limited
  [E1000]: Fix schedule while atomic when called from mii-tool.
  [NETX]: Fix build failure added by 2.6.24 statistics cleanup.
  [EP93xx_ETH]: Build fix after 2.6.24 NAPI changes.
  [PKT_SCHED]: Check subqueue status before calling hard_start_xmit
parents 2f1f53bd d90bf5a9

drivers/char/random.c

+3 −3
Original line number Diff line number Diff line
@@ -1494,7 +1494,7 @@ __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr, 
	seq = twothirdsMD4Transform((const __u32 *)daddr, hash) & HASH_MASK;

	seq += keyptr->count;



	seq += ktime_get_real().tv64;

	seq += ktime_to_ns(ktime_get_real());



	return seq;

}
@@ -1556,7 +1556,7 @@ __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr, 
	 *	overlaps less than one time per MSL (2 minutes).

	 *	Choosing a clock of 64 ns period is OK. (period of 274 s)

	 */

	seq += ktime_get_real().tv64 >> 6;

	seq += ktime_to_ns(ktime_get_real()) >> 6;

#if 0

	printk("init_seq(%lx, %lx, %d, %d) = %d\n",

	       saddr, daddr, sport, dport, seq);
@@ -1616,7 +1616,7 @@ u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr, 
	seq = half_md4_transform(hash, keyptr->secret);

	seq |= ((u64)keyptr->count) << (32 - HASH_BITS);



	seq += ktime_get_real().tv64;

	seq += ktime_to_ns(ktime_get_real());

	seq &= (1ull << 48) - 1;

#if 0

	printk("dccp init_seq(%lx, %lx, %d, %d) = %d\n",

drivers/isdn/sc/card.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ void memcpy_fromshmem(int card, void *dest, const void *src, size_t n); 
int get_card_from_id(int driver);

int indicate_status(int card, int event, ulong Channel, char *Data);

irqreturn_t interrupt_handler(int interrupt, void *cardptr);

int sndpkt(int devId, int channel, struct sk_buff *data);

int sndpkt(int devId, int channel, int ack, struct sk_buff *data);

void rcvpkt(int card, RspMessage *rcvmsg);

int command(isdn_ctrl *cmd);

int reset(int card);

drivers/isdn/sc/packet.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "message.h"

#include "card.h"



int sndpkt(int devId, int channel, struct sk_buff *data)

int sndpkt(int devId, int channel, int ack, struct sk_buff *data)

{

	LLData	ReqLnkWrite;

	int status;

drivers/isdn/sc/shmem.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t n) 


	outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80,

		sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]);

	memcpy_toio(sc_adapter[card]->rambase + dest_rem, src, n);

	memcpy_toio((void __iomem *)(sc_adapter[card]->rambase + dest_rem), src, n);

	spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);

	pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename,

		((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);

drivers/net/arm/ep93xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static irqreturn_t ep93xx_irq(int irq, void *dev_id) 


	if (status & REG_INTSTS_RX) {

		spin_lock(&ep->rx_lock);

		if (likely(__netif_rx_schedule_prep(dev, &ep->napi))) {

		if (likely(netif_rx_schedule_prep(dev, &ep->napi))) {

			wrl(ep, REG_INTEN, REG_INTEN_TX);

			__netif_rx_schedule(dev, &ep->napi);

		}