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

Commit 29ac0052 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:
  [AF_RXRPC]: Add a missing goto
  [VLAN]: Lost rtnl_unlock() in vlan_ioctl()
  [SCTP]: Fix the bind_addr info during migration.
  [SCTP]: Add bind hash locking to the migrate code
  [IPV4]: Remove prototype of ip_rt_advice
  [IPv4]: Reply net unreachable ICMP message
  [IPv6] SNMP: Increment OutNoRoutes when connecting to unreachable network
  [BRIDGE]: Section fix.
  [NIU]: Fix link LED handling.
parents f3656b9a 4aa9cb32

drivers/net/niu.c

+18 −4
Original line number Diff line number Diff line
@@ -1045,6 +1045,7 @@ static int niu_serdes_init(struct niu *np) 
}



static void niu_init_xif(struct niu *);

static void niu_handle_led(struct niu *, int status);



static int niu_link_status_common(struct niu *np, int link_up)

{
@@ -1066,11 +1067,15 @@ static int niu_link_status_common(struct niu *np, int link_up) 


		spin_lock_irqsave(&np->lock, flags);

		niu_init_xif(np);

		niu_handle_led(np, 1);

		spin_unlock_irqrestore(&np->lock, flags);



		netif_carrier_on(dev);

	} else if (netif_carrier_ok(dev) && !link_up) {

		niuwarn(LINK, "%s: Link is down\n", dev->name);

		spin_lock_irqsave(&np->lock, flags);

		niu_handle_led(np, 0);

		spin_unlock_irqrestore(&np->lock, flags);

		netif_carrier_off(dev);

	}
@@ -3915,16 +3920,14 @@ static int niu_init_ipp(struct niu *np) 
	return 0;

}



static void niu_init_xif_xmac(struct niu *np)

static void niu_handle_led(struct niu *np, int status)

{

	struct niu_link_config *lp = &np->link_config;

	u64 val;



	val = nr64_mac(XMAC_CONFIG);



	if ((np->flags & NIU_FLAGS_10G) != 0 &&

	    (np->flags & NIU_FLAGS_FIBER) != 0) {

		if (netif_carrier_ok(np->dev)) {

		if (status) {

			val |= XMAC_CONFIG_LED_POLARITY;

			val &= ~XMAC_CONFIG_FORCE_LED_ON;

		} else {
@@ -3933,6 +3936,15 @@ static void niu_init_xif_xmac(struct niu *np) 
		}

	}



	nw64_mac(XMAC_CONFIG, val);

}



static void niu_init_xif_xmac(struct niu *np)

{

	struct niu_link_config *lp = &np->link_config;

	u64 val;



	val = nr64_mac(XMAC_CONFIG);

	val &= ~XMAC_CONFIG_SEL_POR_CLK_SRC;



	val |= XMAC_CONFIG_TX_OUTPUT_EN;
@@ -4776,6 +4788,8 @@ static int niu_close(struct net_device *dev) 


	niu_free_channels(np);



	niu_handle_led(np, 0);



	return 0;

}

include/net/route.h

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ struct in_device; 
extern int		ip_rt_init(void);

extern void		ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,

				       __be32 src, struct net_device *dev);

extern void		ip_rt_advice(struct rtable **rp, int advice);

extern void		rt_cache_flush(int how);

extern int		__ip_route_output_key(struct rtable **, const struct flowi *flp);

extern int		ip_route_output_key(struct rtable **, struct flowi *flp);

include/net/sctp/structs.h

+3 −0
Original line number Diff line number Diff line
@@ -1184,6 +1184,9 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest, 
			const struct sctp_bind_addr *src,

			sctp_scope_t scope, gfp_t gfp,

			int flags);

int sctp_bind_addr_dup(struct sctp_bind_addr *dest,

			const struct sctp_bind_addr *src,

			gfp_t gfp);

int sctp_add_bind_addr(struct sctp_bind_addr *, union sctp_addr *,

		       __u8 use_as_src, gfp_t gfp);

int sctp_del_bind_addr(struct sctp_bind_addr *, union sctp_addr *);

net/8021q/vlan.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) 
	case SET_VLAN_NAME_TYPE_CMD:

		err = -EPERM;

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

			break;

		if ((args.u.name_type >= 0) &&

		    (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {

			vlan_name_type = args.u.name_type;

net/bridge/br_fdb.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int __init br_fdb_init(void) 
	return 0;

}



void __exit br_fdb_fini(void)

void br_fdb_fini(void)

{

	kmem_cache_destroy(br_fdb_cache);

}