Commit 3668805a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
  [IPSEC] flow: reorder "struct flow_cache_entry" and remove SLAB_HWCACHE_ALIGN
  [DECNET] ROUTE: remove unecessary alignment
  [IPSEC]: Add support for aes-ctr.
  [ISDN]: fix section mismatch warning in enpci_card_msg
  [TIPC]: declare proto_ops structures as 'const'.
  [TIPC]: Kill unused static inline (x5)
  [TC]: oops in em_meta
  [IPV6] Minor cleanup: remove unused definitions in net/ip6_fib.h
  [IPV6] Minor clenup: remove two unused definitions in net/ip6_route.h
  [AF_IUCV]: defensive programming of iucv_callback_txdone
  [AF_IUCV]: broken send_skb_q results in endless loop
  [IUCV]: wrong irq-disabling locking at module load time
  [CAN]: Minor clean-ups
  [CAN]: Move proto_{,un}register() out of spin-locked region
  [CAN]: Clean up module auto loading
  [IPSEC] flow: Remove an unnecessary ____cacheline_aligned
  [IPV4]: route: fix crash ip_route_input
  [NETFILTER]: xt_iprange: add missing #include
  [NETFILTER]: xt_iprange: fix typo in address family
  [NETFILTER]: nf_conntrack: fix ct_extend ->move operation
  ...
parents 7b791d44 dd5a1843

drivers/isdn/hisax/amd7930_fn.c

+1 −2
Original line number Diff line number Diff line
@@ -744,8 +744,7 @@ dbusy_timer_handler(struct IsdnCardState *cs) 






void __devinit

Amd7930_init(struct IsdnCardState *cs)

void Amd7930_init(struct IsdnCardState *cs)

{

    WORD *ptr;

    BYTE cmd, cnt;

include/linux/pfkeyv2.h

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ struct sadb_x_sec_ctx { 
#define SADB_X_EALG_BLOWFISHCBC		7

#define SADB_EALG_NULL			11

#define SADB_X_EALG_AESCBC		12

#define SADB_X_EALG_AESCTR		13

#define SADB_X_EALG_AES_CCM_ICV8	14

#define SADB_X_EALG_AES_CCM_ICV12	15

#define SADB_X_EALG_AES_CCM_ICV16	16

include/net/ip6_fib.h

+0 −13
Original line number Diff line number Diff line
@@ -150,19 +150,6 @@ struct rt6_statistics { 
 *

 */



#define RTPRI_FIREWALL	8		/* Firewall control information	*/

#define RTPRI_FLOW	16		/* Flow based forwarding rules	*/

#define RTPRI_KERN_CTL	32		/* Kernel control routes	*/



#define RTPRI_USER_MIN	256		/* Mimimum user priority	*/

#define RTPRI_USER_MAX	1024		/* Maximum user priority	*/



#define RTPRI_KERN_DFLT	4096		/* Kernel default routes	*/



#define	MAX_FLOW_BACKTRACE	32





typedef void			(*f_pnode)(struct fib6_node *fn, void *);



struct fib6_table {

	struct hlist_node	tb6_hlist;

include/net/ip6_route.h

+0 −2
Original line number Diff line number Diff line 
#ifndef _NET_IP6_ROUTE_H

#define _NET_IP6_ROUTE_H



#define IP6_RT_PRIO_FW		16

#define IP6_RT_PRIO_USER	1024

#define IP6_RT_PRIO_ADDRCONF	256

#define IP6_RT_PRIO_KERN	512

#define IP6_RT_FLOW_MASK	0x00ff



struct route_info {

	__u8			type;

include/net/netfilter/nf_conntrack_extend.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct nf_ct_ext_type 
	void (*destroy)(struct nf_conn *ct);

	/* Called when realloacted (can be NULL).

	   Contents has already been moved. */

	void (*move)(struct nf_conn *ct, void *old);

	void (*move)(void *new, void *old);



	enum nf_ct_ext_id id;

CRA Git | Maintained and supported by SUSTech CRA and CCSE