Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/ixgbe Whitespace fix. No functional...



details:   https://anonhg.NetBSD.org/src/rev/94d72caaa7d1
branches:  trunk
changeset: 319088:94d72caaa7d1
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed May 16 08:08:24 2018 +0000

description:
Whitespace fix. No functional change.

diffstat:

 sys/dev/pci/ixgbe/ix_txrx.c |  35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diffs (109 lines):

diff -r f1d5ee8cc677 -r 94d72caaa7d1 sys/dev/pci/ixgbe/ix_txrx.c
--- a/sys/dev/pci/ixgbe/ix_txrx.c       Wed May 16 07:51:17 2018 +0000
+++ b/sys/dev/pci/ixgbe/ix_txrx.c       Wed May 16 08:08:24 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.43 2018/05/16 07:51:17 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.44 2018/05/16 08:08:24 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -169,6 +169,7 @@
                /* Send a copy of the frame to the BPF listener */
                bpf_mtap(ifp, m_head);
        }
+
        if (enqueued) {
                txr->lastsent = time_uptime;
                txr->sending = true;
@@ -253,6 +254,8 @@
                IXGBE_TX_UNLOCK(txr);
        } else {
                if (adapter->txrx_use_workqueue) {
+                       u_int *enqueued;
+
                        /*
                         * This function itself is not called in interrupt
                         * context, however it can be called in fast softint
@@ -261,11 +264,12 @@
                         * enqueuing when the machine uses both spontaneous
                         * packets and forwarding packets.
                         */
-                       u_int *enqueued = percpu_getref(adapter->txr_wq_enqueued);
+                       enqueued = percpu_getref(adapter->txr_wq_enqueued);
                        if (*enqueued == 0) {
                                *enqueued = 1;
                                percpu_putref(adapter->txr_wq_enqueued);
-                               workqueue_enqueue(adapter->txr_wq, &txr->wq_cookie, curcpu());
+                               workqueue_enqueue(adapter->txr_wq,
+                                   &txr->wq_cookie, curcpu());
                        } else
                                percpu_putref(adapter->txr_wq_enqueued);
                } else
@@ -1960,46 +1964,46 @@
                        if (adapter->num_queues > 1) {
                                sendmp->m_pkthdr.flowid =
                                    le32toh(cur->wb.lower.hi_dword.rss);
-                               switch (pkt_info & IXGBE_RXDADV_RSSTYPE_MASK) {  
-                                   case IXGBE_RXDADV_RSSTYPE_IPV4:
+                               switch (pkt_info & IXGBE_RXDADV_RSSTYPE_MASK) {
+                               case IXGBE_RXDADV_RSSTYPE_IPV4:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_IPV4);
                                        break;
-                                   case IXGBE_RXDADV_RSSTYPE_IPV4_TCP:
+                               case IXGBE_RXDADV_RSSTYPE_IPV4_TCP:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_TCP_IPV4);
                                        break;
-                                   case IXGBE_RXDADV_RSSTYPE_IPV6:
+                               case IXGBE_RXDADV_RSSTYPE_IPV6:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_IPV6);
                                        break;
-                                   case IXGBE_RXDADV_RSSTYPE_IPV6_TCP:
+                               case IXGBE_RXDADV_RSSTYPE_IPV6_TCP:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_TCP_IPV6);
                                        break;
-                                   case IXGBE_RXDADV_RSSTYPE_IPV6_EX:
+                               case IXGBE_RXDADV_RSSTYPE_IPV6_EX:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_IPV6_EX);
                                        break;
-                                   case IXGBE_RXDADV_RSSTYPE_IPV6_TCP_EX:
+                               case IXGBE_RXDADV_RSSTYPE_IPV6_TCP_EX:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_TCP_IPV6_EX);
                                        break;
 #if __FreeBSD_version > 1100000
-                                   case IXGBE_RXDADV_RSSTYPE_IPV4_UDP:
+                               case IXGBE_RXDADV_RSSTYPE_IPV4_UDP:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_UDP_IPV4);
                                        break;
-                                   case IXGBE_RXDADV_RSSTYPE_IPV6_UDP:
+                               case IXGBE_RXDADV_RSSTYPE_IPV6_UDP:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_UDP_IPV6);
                                        break;
-                                   case IXGBE_RXDADV_RSSTYPE_IPV6_UDP_EX:
+                               case IXGBE_RXDADV_RSSTYPE_IPV6_UDP_EX:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_RSS_UDP_IPV6_EX);
                                        break;
 #endif
-                                   default:
+                               default:
                                        M_HASHTYPE_SET(sendmp,
                                            M_HASHTYPE_OPAQUE_HASH);
                                }
@@ -2124,7 +2128,8 @@
                               &dma->dma_tag);
        if (r != 0) {
                aprint_error_dev(dev,
-                   "%s: ixgbe_dma_tag_create failed; error %d\n", __func__, r);
+                   "%s: ixgbe_dma_tag_create failed; error %d\n", __func__,
+                   r);
                goto fail_0;
        }
 



Home | Main Index | Thread Index | Old Index