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

Commit d1d25aab authored by Jan-Bernd Themann's avatar Jan-Bernd Themann Committed by Jeff Garzik
Browse files

ehea: Whitespace cleanup 



This patch fixes several whitespace issues.

Signed-off-by: default avatarJan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7c00db3d

drivers/net/ehea/ehea.h

+7 −7
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0064"

#define DRV_VERSION	"EHEA_0065"



#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \

	| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)

drivers/net/ehea/ehea_main.c

+17 −15
Original line number Diff line number Diff line
@@ -1695,6 +1695,7 @@ static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev, 
{

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

		const struct iphdr *iph = ip_hdr(skb);



		/* IPv4 */

		swqe->tx_control |= EHEA_SWQE_CRC

				 | EHEA_SWQE_IP_CHECKSUM
@@ -1705,13 +1706,12 @@ static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev, 
		write_ip_start_end(swqe, skb);



		if (iph->protocol == IPPROTO_UDP) {

			if ((iph->frag_off & IP_MF) ||

			    (iph->frag_off & IP_OFFSET))

			if ((iph->frag_off & IP_MF)

			    || (iph->frag_off & IP_OFFSET))

				/* IP fragment, so don't change cs */

				swqe->tx_control &= ~EHEA_SWQE_TCP_CHECKSUM;

			else

				write_udp_offset_end(swqe, skb);



		} else if (iph->protocol == IPPROTO_TCP) {

			write_tcp_offset_end(swqe, skb);

		}
@@ -1739,6 +1739,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, 


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

		const struct iphdr *iph = ip_hdr(skb);



		/* IPv4 */

		write_ip_start_end(swqe, skb);
@@ -1751,8 +1752,8 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, 
			write_tcp_offset_end(swqe, skb);



		} else if (iph->protocol == IPPROTO_UDP) {

			if ((iph->frag_off & IP_MF) ||

			    (iph->frag_off & IP_OFFSET))

			if ((iph->frag_off & IP_MF)

			    || (iph->frag_off & IP_OFFSET))

				/* IP fragment, so don't change cs */

				swqe->tx_control |= EHEA_SWQE_CRC

						 | EHEA_SWQE_IMM_DATA_PRESENT;
@@ -2601,6 +2602,7 @@ static int ehea_setup_ports(struct ehea_adapter *adapter) 
{

	struct device_node *lhea_dn;

	struct device_node *eth_dn = NULL;



	const u32 *dn_log_port_id;

	int i = 0;

drivers/net/ehea/ehea_qmr.c

+28 −28

File changed.

Contains only whitespace changes.

drivers/net/ehea/ehea_hw.h

+12 −12

File changed.

Contains only whitespace changes.