IB/rxe: Change rxe_rcv to return void (10c47d56) · Commits · 戴 / test

drivers/infiniband/sw/rxe/rxe.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ int rxe_add(struct rxe_dev *rxe, unsigned int mtu);
		void rxe_remove(struct rxe_dev *rxe);
		void rxe_remove_all(void);

		int rxe_rcv(struct sk_buff *skb);
		void rxe_rcv(struct sk_buff *skb);

		static inline void rxe_dev_put(struct rxe_dev *rxe)
		{

+3 −2

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ void rxe_mem_cleanup(struct rxe_pool_entry *arg);
		int advance_dma_data(struct rxe_dma_info *dma, unsigned int length);

		/* rxe_net.c */
		int rxe_loopback(struct sk_buff *skb);
		void rxe_loopback(struct sk_buff *skb);
		int rxe_send(struct rxe_pkt_info pkt, struct sk_buff skb);
		struct sk_buff rxe_init_packet(struct rxe_dev rxe, struct rxe_av *av,
		int paylen, struct rxe_pkt_info *pkt);
		@@ -268,7 +268,8 @@ static inline int rxe_xmit_packet(struct rxe_dev rxe, struct rxe_qp qp,

		if (pkt->mask & RXE_LOOPBACK_MASK) {
		memcpy(SKB_TO_PKT(skb), pkt, sizeof(*pkt));
		err = rxe_loopback(skb);
		rxe_loopback(skb);
		err = 0;
		} else {
		err = rxe_send(pkt, skb);
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -276,9 +276,12 @@ static int rxe_udp_encap_recv(struct sock sk, struct sk_buff skb)
		pkt->mask = RXE_GRH_MASK;
		pkt->paylen = be16_to_cpu(udph->len) - sizeof(*udph);

		return rxe_rcv(skb);
		rxe_rcv(skb);

		return 0;
		drop:
		kfree_skb(skb);

		return 0;
		}

		@@ -517,9 +520,9 @@ int rxe_send(struct rxe_pkt_info pkt, struct sk_buff skb)
		return 0;
		}

		int rxe_loopback(struct sk_buff *skb)
		void rxe_loopback(struct sk_buff *skb)
		{
		return rxe_rcv(skb);
		rxe_rcv(skb);
		}

		static inline int addr_same(struct rxe_dev rxe, struct rxe_av av)

+2 −3

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ static int rxe_match_dgid(struct rxe_dev rxe, struct sk_buff skb)
		}

		/* rxe_rcv is called from the interface driver */
		int rxe_rcv(struct sk_buff *skb)
		void rxe_rcv(struct sk_buff *skb)
		{
		int err;
		struct rxe_pkt_info *pkt = SKB_TO_PKT(skb);
		@@ -403,12 +403,11 @@ int rxe_rcv(struct sk_buff *skb)
		else
		rxe_rcv_pkt(rxe, pkt, skb);

		return 0;
		return;

		drop:
		if (pkt->qp)
		rxe_drop_ref(pkt->qp);

		kfree_skb(skb);
		return 0;
		}