Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (f7402dc4) · Commits · e / devices / android_kernel_xiaomi_markw

crypto/cipher.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -191,6 +191,8 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,
		u8 *iv = desc->info;
		unsigned int done = 0;

		nbytes -= bsize;

		do {
		xor(iv, src);
		fn(crypto_tfm_ctx(tfm), dst, iv);
		@@ -198,7 +200,7 @@ static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,

		src += bsize;
		dst += bsize;
		} while ((done += bsize) < nbytes);
		} while ((done += bsize) <= nbytes);

		return done;
		}
		@@ -219,6 +221,8 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
		u8 *iv = desc->info;
		unsigned int done = 0;

		nbytes -= bsize;

		do {
		u8 tmp_dst = dst_p;

		@@ -230,7 +234,7 @@ static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,

		src += bsize;
		dst += bsize;
		} while ((done += bsize) < nbytes);
		} while ((done += bsize) <= nbytes);

		return done;
		}
		@@ -243,12 +247,14 @@ static unsigned int ecb_process(const struct cipher_desc desc, u8 dst,
		void (fn)(void , u8 , const u8 ) = desc->crfn;
		unsigned int done = 0;

		nbytes -= bsize;

		do {
		fn(crypto_tfm_ctx(tfm), dst, src);

		src += bsize;
		dst += bsize;
		} while ((done += bsize) < nbytes);
		} while ((done += bsize) <= nbytes);

		return done;
		}

drivers/net/arcnet/arcnet.c

+17 −8

Original line number	Diff line number	Diff line
		@@ -597,7 +597,7 @@ static int arcnet_send_packet(struct sk_buff skb, struct net_device dev)
		struct ArcProto *proto;
		int txbuf;
		unsigned long flags;
		int freeskb = 0;
		int freeskb, retval;

		BUGMSG(D_DURING,
		"transmit requested (status=%Xh, txbufs=%d/%d, len=%d, protocol %x)\n",
		@@ -615,7 +615,7 @@ static int arcnet_send_packet(struct sk_buff skb, struct net_device dev)
		if (skb->len - ARC_HDR_SIZE > XMTU && !proto->continue_tx) {
		BUGMSG(D_NORMAL, "fixme: packet too large: compensating badly!\n");
		dev_kfree_skb(skb);
		return 0; /* don't try again */
		return NETDEV_TX_OK; /* don't try again */
		}

		/* We're busy transmitting a packet... */
		@@ -623,8 +623,11 @@ static int arcnet_send_packet(struct sk_buff skb, struct net_device dev)

		spin_lock_irqsave(&lp->lock, flags);
		AINTMASK(0);

		if(lp->next_tx == -1)
		txbuf = get_arcbuf(dev);
		else {
		txbuf = -1;
		}
		if (txbuf != -1) {
		if (proto->prepare_tx(dev, pkt, skb->len, txbuf) &&
		!proto->ack_tx) {
		@@ -638,6 +641,8 @@ static int arcnet_send_packet(struct sk_buff skb, struct net_device dev)
		lp->outgoing.skb = skb;
		lp->outgoing.pkt = pkt;

		freeskb = 0;

		if (proto->continue_tx &&
		proto->continue_tx(dev, txbuf)) {
		BUGMSG(D_NORMAL,
		@@ -645,10 +650,12 @@ static int arcnet_send_packet(struct sk_buff skb, struct net_device dev)
		"(proto='%c')\n", proto->suffix);
		}
		}

		retval = NETDEV_TX_OK;
		dev->trans_start = jiffies;
		lp->next_tx = txbuf;
		} else {
		freeskb = 1;
		retval = NETDEV_TX_BUSY;
		freeskb = 0;
		}

		BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());
		@@ -664,7 +671,7 @@ static int arcnet_send_packet(struct sk_buff skb, struct net_device dev)
		if (freeskb) {
		dev_kfree_skb(skb);
		}
		return 0; /* no need to try again */
		return retval; /* no need to try again */
		}


		@@ -690,7 +697,6 @@ static int go_tx(struct net_device *dev)
		/* start sending */
		ACOMMAND(TXcmd \| (lp->cur_tx << 3));

		dev->trans_start = jiffies;
		lp->stats.tx_packets++;
		lp->lasttrans_dest = lp->lastload_dest;
		lp->lastload_dest = 0;
		@@ -917,6 +923,9 @@ irqreturn_t arcnet_interrupt(int irq, void dev_id, struct pt_regs regs)

		BUGMSG(D_RECON, "Network reconfiguration detected (status=%Xh)\n",
		status);
		/* MYRECON bit is at bit 7 of diagstatus */
		if(diagstatus & 0x80)
		BUGMSG(D_RECON,"Put out that recon myself\n");

		/* is the RECON info empty or old? */
		if (!lp->first_recon \|\| !lp->last_recon \|\|

include/linux/netfilter_ipv4/ip_conntrack.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,9 @@ struct ip_conntrack_expect
		/* Unique ID */
		unsigned int id;

		/* Flags */
		unsigned int flags;

		#ifdef CONFIG_IP_NF_NAT_NEEDED
		/* This is the original per-proto part, used to map the
		* expected connection the way the recipient expects. */
		@@ -272,6 +275,8 @@ struct ip_conntrack_expect
		#endif
		};

		#define IP_CT_EXPECT_PERMANENT 0x1

		static inline struct ip_conntrack *
		tuplehash_to_ctrack(const struct ip_conntrack_tuple_hash *hash)
		{

include/linux/netfilter_ipv4/ip_conntrack_core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ static inline int ip_conntrack_confirm(struct sk_buff **pskb)
		return ret;
		}

		extern void __ip_ct_expect_unlink_destroy(struct ip_conntrack_expect *exp);
		extern void ip_ct_unlink_expect(struct ip_conntrack_expect *exp);

		extern struct list_head *ip_conntrack_hash;
		extern struct list_head ip_conntrack_expect_list;

include/linux/netfilter_ipv4/ip_nat_rule.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -19,5 +19,10 @@ extern unsigned int
		alloc_null_binding(struct ip_conntrack *conntrack,
		struct ip_nat_info *info,
		unsigned int hooknum);

		extern unsigned int
		alloc_null_binding_confirmed(struct ip_conntrack *conntrack,
		struct ip_nat_info *info,
		unsigned int hooknum);
		#endif
		#endif /* _IP_NAT_RULE_H */