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

Commit b779d0af authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

brocade: Convert uses of __constant_<foo> to <foo> 



The use of __constant_<foo> has been unnecessary for quite awhile now.

Make these uses consistent with the rest of the kernel.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 184593c7

drivers/net/ethernet/brocade/bna/bnad.c

+6 −10
Original line number Diff line number Diff line
@@ -2845,13 +2845,11 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb, 
		}

		if (unlikely((gso_size + skb_transport_offset(skb) +

			      tcp_hdrlen(skb)) >= skb->len)) {

			txqent->hdr.wi.opcode =

				__constant_htons(BNA_TXQ_WI_SEND);

			txqent->hdr.wi.opcode = htons(BNA_TXQ_WI_SEND);

			txqent->hdr.wi.lso_mss = 0;

			BNAD_UPDATE_CTR(bnad, tx_skb_tso_too_short);

		} else {

			txqent->hdr.wi.opcode =

				__constant_htons(BNA_TXQ_WI_SEND_LSO);

			txqent->hdr.wi.opcode = htons(BNA_TXQ_WI_SEND_LSO);

			txqent->hdr.wi.lso_mss = htons(gso_size);

		}
@@ -2865,7 +2863,7 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb, 
			htons(BNA_TXQ_WI_L4_HDR_N_OFFSET(

			tcp_hdrlen(skb) >> 2, skb_transport_offset(skb)));

	} else  {

		txqent->hdr.wi.opcode =	__constant_htons(BNA_TXQ_WI_SEND);

		txqent->hdr.wi.opcode =	htons(BNA_TXQ_WI_SEND);

		txqent->hdr.wi.lso_mss = 0;



		if (unlikely(skb->len > (bnad->netdev->mtu + ETH_HLEN))) {
@@ -2876,11 +2874,10 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb, 
		if (skb->ip_summed == CHECKSUM_PARTIAL) {

			u8 proto = 0;



			if (skb->protocol == __constant_htons(ETH_P_IP))

			if (skb->protocol == htons(ETH_P_IP))

				proto = ip_hdr(skb)->protocol;

#ifdef NETIF_F_IPV6_CSUM

			else if (skb->protocol ==

				 __constant_htons(ETH_P_IPV6)) {

			else if (skb->protocol == htons(ETH_P_IPV6)) {

				/* nexthdr may not be TCP immediately. */

				proto = ipv6_hdr(skb)->nexthdr;

			}
@@ -3062,8 +3059,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev) 
			vect_id = 0;

			BNA_QE_INDX_INC(prod, q_depth);

			txqent = &((struct bna_txq_entry *)tcb->sw_q)[prod];

			txqent->hdr.wi_ext.opcode =

				__constant_htons(BNA_TXQ_WI_EXTENSION);

			txqent->hdr.wi_ext.opcode = htons(BNA_TXQ_WI_EXTENSION);

			unmap = &unmap_q[prod];

		}