Commit eee8abe5 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:
  [BRIDGE]: adding new device to bridge should enable if up
  [IPV6]: Do not set IF_READY if device is down
  [IPSEC]: xfrm audit hook misplaced in pfkey_delete and xfrm_del_sa
  [IPSEC]: Add xfrm policy change auditing to pfkey_spdget
  [IPSEC]: xfrm_policy delete security check misplaced
  [CONNECTOR]: Bugfix for cn_call_callback()
  [DCCP]: Revert patch which disables bidirectional mode
  [IPV6]: Handle np->opt being NULL in ipv6_getsockopt_sticky().
  [UDP]: Reread uh pointer after pskb_trim
  [NETFILTER]: nfnetlink_log: fix crash on bridged packet
  [NETFILTER]: nfnetlink_log: zero-terminate prefix
  [NETFILTER]: nf_conntrack_ipv6: fix incorrect classification of IPv6 fragments as ESTABLISHED
parents 06aa5b4a de79059e

drivers/connector/connector.c

+11 −11
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ EXPORT_SYMBOL_GPL(cn_netlink_send); 
 */

static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), void *data)

{

	struct cn_callback_entry *__cbq;

	struct cn_callback_entry *__cbq, *__new_cbq;

	struct cn_dev *dev = &cdev;

	int err = -ENODEV;
@@ -148,27 +148,27 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v 
			} else {

				struct cn_callback_data *d;

				

				__cbq = kzalloc(sizeof(*__cbq), GFP_ATOMIC);

				if (__cbq) {

					d = &__cbq->data;

				err = -ENOMEM;

				__new_cbq = kzalloc(sizeof(struct cn_callback_entry), GFP_ATOMIC);

				if (__new_cbq) {

					d = &__new_cbq->data;

					d->callback_priv = msg;

					d->callback = __cbq->data.callback;

					d->ddata = data;

					d->destruct_data = destruct_data;

					d->free = __cbq;

					d->free = __new_cbq;



					INIT_WORK(&__cbq->work,

					INIT_WORK(&__new_cbq->work,

							&cn_queue_wrapper);



					if (queue_work(dev->cbdev->cn_queue,

						    &__cbq->work))

						    &__new_cbq->work))

						err = 0;

					else {

						kfree(__cbq);

						kfree(__new_cbq);

						err = -EINVAL;

					}

				} else

					err = -ENOMEM;

				}

			}

			break;

		}

include/net/xfrm.h

+3 −2
Original line number Diff line number Diff line
@@ -988,8 +988,9 @@ extern int xfrm_policy_walk(u8 type, int (*func)(struct xfrm_policy *, int, int, 
int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);

struct xfrm_policy *xfrm_policy_bysel_ctx(u8 type, int dir,

					  struct xfrm_selector *sel,

					  struct xfrm_sec_ctx *ctx, int delete);

struct xfrm_policy *xfrm_policy_byid(u8, int dir, u32 id, int delete);

					  struct xfrm_sec_ctx *ctx, int delete,

					  int *err);

struct xfrm_policy *xfrm_policy_byid(u8, int dir, u32 id, int delete, int *err);

void xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info);

u32 xfrm_get_acqseq(void);

void xfrm_alloc_spi(struct xfrm_state *x, __be32 minspi, __be32 maxspi);

net/bridge/br_if.c

+4 −0
Original line number Diff line number Diff line
@@ -428,6 +428,10 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 
	spin_lock_bh(&br->lock);

	br_stp_recalculate_bridge_id(br);

	br_features_recompute(br);



	if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) &&

	    (br->dev->flags & IFF_UP))

		br_stp_enable_port(p);

	spin_unlock_bh(&br->lock);



	dev_set_mtu(br->dev, br_min_mtu(br));

net/dccp/ccids/ccid3.c

+1 −6
Original line number Diff line number Diff line
@@ -545,12 +545,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) 
		/* set idle flag */

		hctx->ccid3hctx_idle = 1;

		break;

	case TFRC_SSTATE_NO_SENT:

		/*

		 * XXX when implementing bidirectional rx/tx check this again

		 */

		DCCP_WARN("Illegal ACK received - no packet sent\n");

		/* fall through */

	case TFRC_SSTATE_NO_SENT:	/* fall through */

	case TFRC_SSTATE_TERM:		/* ignore feedback when closing */

		break;

	}

net/dccp/input.c

+4 −17
Original line number Diff line number Diff line
@@ -248,18 +248,8 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 
			    DCCP_ACKVEC_STATE_RECEIVED))

		goto discard;



	/*

	 * Deliver to the CCID module in charge.

	 * FIXME: Currently DCCP operates one-directional only, i.e. a listening

	 *        server is not at the same time a connecting client. There is

	 *        not much sense in delivering to both rx/tx sides at the moment

	 *        (only one is active at a time); when moving to bidirectional

	 *        service, this needs to be revised.

	 */

	if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)

		ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);

	else	/* listening or connected server */

	ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);

	ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);



	return __dccp_rcv_established(sk, skb, dh, len);

discard:
@@ -494,11 +484,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
				    DCCP_ACKVEC_STATE_RECEIVED))

			goto discard;



		/* XXX see the comments in dccp_rcv_established about this */

		if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)

			ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);

		else

		ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);

		ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);

	}



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE