lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c
This commit is contained in:
David S. Miller
2008-11-18 23:38:23 -08:00
parent 9a57f7fabd 7f0f598a00
commit 198d6ba4d7
387 changed files with 11925 additions and 2524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/isdn/i4l/isdn_net.c
View File

@@ -1637,8 +1637,8 @@ isdn_net_ciscohdlck_slarp_send_reply(isdn_net_local *lp)
/* slarp reply, send own ip/netmask; if values are nonsense remote
* should think we are unable to provide it with an address via SLARP */
*(__be32 *)(p + 4) = cpu_to_be32(CISCO_SLARP_REPLY);
*(__be32 *)(p + 8) = cpu_to_be32(addr); // address
*(__be32 *)(p + 12) = cpu_to_be32(mask); // netmask
*(__be32 *)(p + 8) = addr; // address
*(__be32 *)(p + 12) = mask; // netmask
*(__be16 *)(p + 16) = cpu_to_be16(0); // unused
p += 18;