Commit 4259cb25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
  [NETPOLL]: Fix local_bh_enable() warning.
  [IPVS]: Make ip_vs_sync.c <= 80col wide.
  [IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep()
  [HAMRADIO]: Fix baycom_epp.c compile failure.
  [DCCP]: Whitespace cleanups
  [DCCP] ccid3: Fixup some type conversions related to rtts
  [DCCP] ccid3: BUG-FIX - conversion errors
  [DCCP] ccid3: Reorder packet history source file
  [DCCP] ccid3: Reorder packet history header file
  [DCCP] ccid3: Make debug output consistent
  [DCCP] ccid3: Perform history operations only after packet has been sent
  [DCCP] ccid3: TX history - remove unused field
  [DCCP] ccid3: Shift window counter computation
  [DCCP] ccid3: Sanity-check RTT samples
  [DCCP] ccid3: Initialise RTT values
  [DCCP] ccid: Deprecate ccid_hc_tx_insert_options
  [DCCP]: Warn when discarding packet due to internal errors
  [DCCP]: Only deliver to the CCID rx side in charge
  [DCCP]: Simplify TFRC calculation
  [DCCP]: Debug timeval operations
  ...
parents cd39301a a49f99ff

Documentation/networking/dccp.txt

+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ for real time and multimedia traffic. 


It has a base protocol and pluggable congestion control IDs (CCIDs).



It is at experimental RFC status and the homepage for DCCP as a protocol is at:

It is at proposed standard RFC status and the homepage for DCCP as a protocol

is at:

	http://www.read.cs.ucla.edu/dccp/



Missing features
@@ -34,9 +35,6 @@ The known bugs are at: 
Socket options

==============



DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for

calculations.



DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of

service codes (RFC 4340, sec. 8.1.2); if this socket option is not set,

the socket will fall back to 0 (which means that no meaningful service code

crypto/sha512.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#define SHA384_DIGEST_SIZE 48

#define SHA512_DIGEST_SIZE 64

#define SHA384_HMAC_BLOCK_SIZE  96

#define SHA384_HMAC_BLOCK_SIZE 128

#define SHA512_HMAC_BLOCK_SIZE 128



struct sha512_ctx {

drivers/atm/.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
fore200e_mkfirm

fore200e_pca_fw.c

pca200e.bin

pca200e_ecd.bin2

drivers/net/hamradio/baycom_epp.c

+1 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ static void baycom_probe(struct net_device *dev) 
	dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */

	dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_nocall, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &null_ax25_address, AX25_ADDR_LEN);

	dev->tx_queue_len = 16;



	/* New style flags */

drivers/net/wan/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ config SDLA 


# Wan router core.

config WAN_ROUTER_DRIVERS

	bool "WAN router drivers"

	tristate "WAN router drivers"

	depends on WAN && WAN_ROUTER

	---help---

	  Connect LAN to WAN via Linux box.
@@ -393,7 +393,8 @@ config WAN_ROUTER_DRIVERS 
	  <file:Documentation/networking/wan-router.txt>.



	  Note that the answer to this question won't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  kernel except for how subordinate drivers may be built:

	  saying N will just cause the configurator to skip all

	  the questions about WAN router drivers.



	  If unsure, say N.

CRA Git | Maintained and supported by SUSTech CRA and CCSE