Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Browse files Browse the repository at this point in the history 
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BNX2]: Fix occasional NETDEV WATCHDOG on 5709.
  [IPV6]: Disallow RH0 by default.
  [XFRM]: beet: fix pseudo header length value
  [TCP]: Congestion control initialization.
  • Loading branch information
Linus Torvalds committed Apr 25, 2007
2 parents 6f4c5bd + 68c9f75 commit 1214538
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 20 deletions.
9 changes: 9 additions & 0 deletions Documentation/networking/ip-sysctl.txt
View file
Expand Up @@ -851,6 +851,15 @@ accept_redirects - BOOLEAN
Functional default: enabled if local forwarding is disabled.
disabled if local forwarding is enabled.

accept_source_route - INTEGER
Accept source routing (routing extension header).

> 0: Accept routing header.
= 0: Accept only routing header type 2.
< 0: Do not accept routing header.

Default: 0

autoconf - BOOLEAN
Autoconfigure addresses using Prefix Information in Router
Advertisements.
Expand Down
7 changes: 5 additions & 2 deletions drivers/net/bnx2.c
View file
Expand Up @@ -54,8 +54,8 @@

#define DRV_MODULE_NAME "bnx2"
#define PFX DRV_MODULE_NAME ": "
#define DRV_MODULE_VERSION "1.5.7"
#define DRV_MODULE_RELDATE "March 29, 2007"
#define DRV_MODULE_VERSION "1.5.8"
#define DRV_MODULE_RELDATE "April 24, 2007"

#define RUN_AT(x) (jiffies + (x))

Expand Down Expand Up @@ -3421,6 +3421,9 @@ bnx2_init_chip(struct bnx2 *bp)
val = REG_RD(bp, BNX2_MQ_CONFIG);
val &= ~BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE;
val |= BNX2_MQ_CONFIG_KNL_BYP_BLK_SIZE_256;
if (CHIP_ID(bp) == CHIP_ID_5709_A0 || CHIP_ID(bp) == CHIP_ID_5709_A1)
val |= BNX2_MQ_CONFIG_HALT_DIS;

REG_WR(bp, BNX2_MQ_CONFIG, val);

val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE);
Expand Down
1 change: 1 addition & 0 deletions drivers/net/bnx2.h
View file
Expand Up @@ -6518,6 +6518,7 @@ struct bnx2 {
#define CHIP_ID_5708_B0 0x57081000
#define CHIP_ID_5708_B1 0x57081010
#define CHIP_ID_5709_A0 0x57090000
#define CHIP_ID_5709_A1 0x57090010

#define CHIP_BOND_ID(bp) (((bp)->chip_id) & 0xf)

Expand Down
3 changes: 3 additions & 0 deletions include/linux/ipv6.h
View file
Expand Up @@ -177,6 +177,7 @@ struct ipv6_devconf {
#endif
#endif
__s32 proxy_ndp;
__s32 accept_source_route;
void *sysctl;
};

Expand Down Expand Up @@ -205,6 +206,8 @@ enum {
DEVCONF_RTR_PROBE_INTERVAL,
DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
DEVCONF_PROXY_NDP,
__DEVCONF_OPTIMISTIC_DAD,
DEVCONF_ACCEPT_SOURCE_ROUTE,
DEVCONF_MAX
};

Expand Down
1 change: 1 addition & 0 deletions include/linux/sysctl.h
View file
Expand Up @@ -580,6 +580,7 @@ enum {
NET_IPV6_RTR_PROBE_INTERVAL=21,
NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
NET_IPV6_PROXY_NDP=23,
NET_IPV6_ACCEPT_SOURCE_ROUTE=25,
__NET_IPV6_MAX
};

Expand Down
23 changes: 13 additions & 10 deletions net/ipv4/tcp_cong.c
View file
Expand Up @@ -77,18 +77,19 @@ void tcp_init_congestion_control(struct sock *sk)
struct inet_connection_sock *icsk = inet_csk(sk);
struct tcp_congestion_ops *ca;

if (icsk->icsk_ca_ops != &tcp_init_congestion_ops)
return;
/* if no choice made yet assign the current value set as default */
if (icsk->icsk_ca_ops == &tcp_init_congestion_ops) {
rcu_read_lock();
list_for_each_entry_rcu(ca, &tcp_cong_list, list) {
if (try_module_get(ca->owner)) {
icsk->icsk_ca_ops = ca;
break;
}

rcu_read_lock();
list_for_each_entry_rcu(ca, &tcp_cong_list, list) {
if (try_module_get(ca->owner)) {
icsk->icsk_ca_ops = ca;
break;
/* fallback to next available */
}

rcu_read_unlock();
}
rcu_read_unlock();

if (icsk->icsk_ca_ops->init)
icsk->icsk_ca_ops->init(sk);
Expand Down Expand Up @@ -236,6 +237,7 @@ int tcp_set_congestion_control(struct sock *sk, const char *name)

rcu_read_lock();
ca = tcp_ca_find(name);

/* no change asking for existing value */
if (ca == icsk->icsk_ca_ops)
goto out;
Expand All @@ -261,7 +263,8 @@ int tcp_set_congestion_control(struct sock *sk, const char *name)
else {
tcp_cleanup_congestion_control(sk);
icsk->icsk_ca_ops = ca;
if (icsk->icsk_ca_ops->init)

if (sk->sk_state != TCP_CLOSE && icsk->icsk_ca_ops->init)
icsk->icsk_ca_ops->init(sk);
}
out:
Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/xfrm4_mode_beet.c
View file
Expand Up @@ -52,7 +52,7 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)

ph = (struct ip_beet_phdr *)skb->h.raw;
ph->padlen = 4 - (optlen & 4);
ph->hdrlen = (optlen + ph->padlen + sizeof(*ph)) / 8;
ph->hdrlen = optlen / 8;
ph->nexthdr = top_iph->protocol;
if (ph->padlen)
memset(ph + 1, IPOPT_NOP, ph->padlen);
Expand Down Expand Up @@ -85,7 +85,7 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb)
ph = (struct ip_beet_phdr *)(skb->h.ipiph + 1);

phlen = sizeof(*ph) + ph->padlen;
optlen = ph->hdrlen * 8 - phlen;
optlen = ph->hdrlen * 8 + (IPV4_BEET_PHMAXLEN - phlen);
if (optlen < 0 || optlen & 3 || optlen > 250)
goto out;

Expand Down
11 changes: 11 additions & 0 deletions net/ipv6/addrconf.c
View file
Expand Up @@ -172,6 +172,7 @@ struct ipv6_devconf ipv6_devconf __read_mostly = {
#endif
#endif
.proxy_ndp = 0,
.accept_source_route = 0, /* we do not accept RH0 by default. */
};

static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
Expand Down Expand Up @@ -203,6 +204,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
#endif
#endif
.proxy_ndp = 0,
.accept_source_route = 0, /* we do not accept RH0 by default. */
};

/* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */
Expand Down Expand Up @@ -3356,6 +3358,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
#endif
#endif
array[DEVCONF_PROXY_NDP] = cnf->proxy_ndp;
array[DEVCONF_ACCEPT_SOURCE_ROUTE] = cnf->accept_source_route;
}

static inline size_t inet6_if_nlmsg_size(void)
Expand Down Expand Up @@ -3883,6 +3886,14 @@ static struct addrconf_sysctl_table
.mode = 0644,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = NET_IPV6_ACCEPT_SOURCE_ROUTE,
.procname = "accept_source_route",
.data = &ipv6_devconf.accept_source_route,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_dointvec,
},
{
.ctl_name = 0, /* sentinel */
}
Expand Down
40 changes: 34 additions & 6 deletions net/ipv6/exthdrs.c
View file
Expand Up @@ -362,10 +362,27 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
struct inet6_skb_parm *opt = IP6CB(skb);
struct in6_addr *addr = NULL;
struct in6_addr daddr;
struct inet6_dev *idev;
int n, i;

struct ipv6_rt_hdr *hdr;
struct rt0_hdr *rthdr;
int accept_source_route = ipv6_devconf.accept_source_route;

if (accept_source_route < 0 ||
((idev = in6_dev_get(skb->dev)) == NULL)) {
kfree_skb(skb);
return -1;
}
if (idev->cnf.accept_source_route < 0) {
in6_dev_put(idev);
kfree_skb(skb);
return -1;
}

if (accept_source_route > idev->cnf.accept_source_route)
accept_source_route = idev->cnf.accept_source_route;

in6_dev_put(idev);

if (!pskb_may_pull(skb, (skb->h.raw-skb->data)+8) ||
!pskb_may_pull(skb, (skb->h.raw-skb->data)+((skb->h.raw[1]+1)<<3))) {
Expand All @@ -377,6 +394,22 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)

hdr = (struct ipv6_rt_hdr *) skb->h.raw;

switch (hdr->type) {
#ifdef CONFIG_IPV6_MIP6
break;
#endif
case IPV6_SRCRT_TYPE_0:
if (accept_source_route <= 0)
break;
kfree_skb(skb);
return -1;
default:
IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
IPSTATS_MIB_INHDRERRORS);
icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, (&hdr->type) - skb->nh.raw);
return -1;
}

if (ipv6_addr_is_multicast(&skb->nh.ipv6h->daddr) ||
skb->pkt_type != PACKET_HOST) {
IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
Expand Down Expand Up @@ -434,11 +467,6 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)
}
break;
#endif
default:
IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
IPSTATS_MIB_INHDRERRORS);
icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, (&hdr->type) - skb->nh.raw);
return -1;
}

/*
Expand Down

0 comments on commit 1214538

Please sign in to comment.