From 833dfbe746f85898dcbcf421c1177c3fd5773ff2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 19 Dec 2008 17:11:52 -0800 Subject: Staging: epl: run Lindent on *.c files It's a start, still a mess... Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/VirtualEthernetLinux.c | 272 ++++++++++++++--------------- 1 file changed, 129 insertions(+), 143 deletions(-) (limited to 'drivers/staging/epl/VirtualEthernetLinux.c') diff --git a/drivers/staging/epl/VirtualEthernetLinux.c b/drivers/staging/epl/VirtualEthernetLinux.c index c21189c4dc3..522658ba8bf 100644 --- a/drivers/staging/epl/VirtualEthernetLinux.c +++ b/drivers/staging/epl/VirtualEthernetLinux.c @@ -59,7 +59,6 @@ Build Environment: - ------------------------------------------------------------------------- Revision History: @@ -75,7 +74,6 @@ ****************************************************************************/ - #include #include #include @@ -93,13 +91,12 @@ #include #include #include -#include /* for struct sk_buff */ +#include /* for struct sk_buff */ #include "kernel/VirtualEthernet.h" #include "kernel/EplDllkCal.h" #include "kernel/EplDllk.h" - #if(((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) /***************************************************************************/ @@ -110,28 +107,24 @@ /* */ /***************************************************************************/ - //--------------------------------------------------------------------------- // const defines //--------------------------------------------------------------------------- #ifndef EPL_VETH_TX_TIMEOUT //#define EPL_VETH_TX_TIMEOUT (2*HZ) -#define EPL_VETH_TX_TIMEOUT 0 // d.k.: we use no timeout +#define EPL_VETH_TX_TIMEOUT 0 // d.k.: we use no timeout #endif - //--------------------------------------------------------------------------- // local types //--------------------------------------------------------------------------- - - //--------------------------------------------------------------------------- // modul globale vars //--------------------------------------------------------------------------- -static struct net_device * pVEthNetDevice_g = NULL; +static struct net_device *pVEthNetDevice_g = NULL; //--------------------------------------------------------------------------- // local function prototypes @@ -140,11 +133,10 @@ static struct net_device * pVEthNetDevice_g = NULL; static int VEthOpen(struct net_device *pNetDevice_p); static int VEthClose(struct net_device *pNetDevice_p); static int VEthXmit(struct sk_buff *pSkb_p, struct net_device *pNetDevice_p); -static struct net_device_stats* VEthGetStats(struct net_device *pNetDevice_p); +static struct net_device_stats *VEthGetStats(struct net_device *pNetDevice_p); static void VEthTimeout(struct net_device *pNetDevice_p); static tEplKernel VEthRecvFrame(tEplFrameInfo * pFrameInfo_p); - //=========================================================================// // // // P U B L I C F U N C T I O N S // @@ -171,188 +163,182 @@ static tEplKernel VEthRecvFrame(tEplFrameInfo * pFrameInfo_p); static int VEthOpen(struct net_device *pNetDevice_p) { -tEplKernel Ret = kEplSuccessful; + tEplKernel Ret = kEplSuccessful; - //open the device + //open the device // struct net_device_stats* pStats = (struct net_device_stats*)pNetDevice_p->priv; - //start the interface queue for the network subsystem - netif_start_queue(pNetDevice_p); + //start the interface queue for the network subsystem + netif_start_queue(pNetDevice_p); - // register callback function in DLL - Ret = EplDllkRegAsyncHandler(VEthRecvFrame); + // register callback function in DLL + Ret = EplDllkRegAsyncHandler(VEthRecvFrame); - EPL_DBGLVL_VETH_TRACE1("VEthOpen: EplDllkRegAsyncHandler returned 0x%02X\n", Ret); + EPL_DBGLVL_VETH_TRACE1 + ("VEthOpen: EplDllkRegAsyncHandler returned 0x%02X\n", Ret); - return 0; + return 0; } static int VEthClose(struct net_device *pNetDevice_p) { -tEplKernel Ret = kEplSuccessful; + tEplKernel Ret = kEplSuccessful; - EPL_DBGLVL_VETH_TRACE0("VEthClose\n"); + EPL_DBGLVL_VETH_TRACE0("VEthClose\n"); - Ret = EplDllkDeregAsyncHandler(VEthRecvFrame); + Ret = EplDllkDeregAsyncHandler(VEthRecvFrame); - //stop the interface queue for the network subsystem - netif_stop_queue(pNetDevice_p); - return 0; + //stop the interface queue for the network subsystem + netif_stop_queue(pNetDevice_p); + return 0; } - static int VEthXmit(struct sk_buff *pSkb_p, struct net_device *pNetDevice_p) { -tEplKernel Ret = kEplSuccessful; -tEplFrameInfo FrameInfo; - - //transmit function - struct net_device_stats* pStats = (struct net_device_stats*)pNetDevice_p->priv; - - //save timestemp - pNetDevice_p->trans_start = jiffies; - - FrameInfo.m_pFrame = (tEplFrame *)pSkb_p->data; - FrameInfo.m_uiFrameSize = pSkb_p->len; - - //call send fkt on DLL - Ret = EplDllkCalAsyncSend(&FrameInfo, kEplDllAsyncReqPrioGeneric); - if (Ret != kEplSuccessful) - { - EPL_DBGLVL_VETH_TRACE1("VEthXmit: EplDllkCalAsyncSend returned 0x%02X\n", Ret); - netif_stop_queue(pNetDevice_p); - goto Exit; - } - else - { - EPL_DBGLVL_VETH_TRACE0("VEthXmit: frame passed to DLL\n"); - dev_kfree_skb(pSkb_p); - - //set stats for the device - pStats->tx_packets++; - pStats->tx_bytes += FrameInfo.m_uiFrameSize; - } - -Exit: - return 0; + tEplKernel Ret = kEplSuccessful; + tEplFrameInfo FrameInfo; + + //transmit function + struct net_device_stats *pStats = + (struct net_device_stats *)pNetDevice_p->priv; + + //save timestemp + pNetDevice_p->trans_start = jiffies; + + FrameInfo.m_pFrame = (tEplFrame *) pSkb_p->data; + FrameInfo.m_uiFrameSize = pSkb_p->len; + + //call send fkt on DLL + Ret = EplDllkCalAsyncSend(&FrameInfo, kEplDllAsyncReqPrioGeneric); + if (Ret != kEplSuccessful) { + EPL_DBGLVL_VETH_TRACE1 + ("VEthXmit: EplDllkCalAsyncSend returned 0x%02X\n", Ret); + netif_stop_queue(pNetDevice_p); + goto Exit; + } else { + EPL_DBGLVL_VETH_TRACE0("VEthXmit: frame passed to DLL\n"); + dev_kfree_skb(pSkb_p); + + //set stats for the device + pStats->tx_packets++; + pStats->tx_bytes += FrameInfo.m_uiFrameSize; + } + + Exit: + return 0; } - -static struct net_device_stats* VEthGetStats(struct net_device *pNetDevice_p) +static struct net_device_stats *VEthGetStats(struct net_device *pNetDevice_p) { - EPL_DBGLVL_VETH_TRACE0("VEthGetStats\n"); + EPL_DBGLVL_VETH_TRACE0("VEthGetStats\n"); - return (struct net_device_stats *)pNetDevice_p->priv; + return (struct net_device_stats *)pNetDevice_p->priv; } - - static void VEthTimeout(struct net_device *pNetDevice_p) { - EPL_DBGLVL_VETH_TRACE0("VEthTimeout(\n"); + EPL_DBGLVL_VETH_TRACE0("VEthTimeout(\n"); - // $$$ d.k.: move to extra function, which is called by DLL when new space is available in TxFifo - if (netif_queue_stopped (pNetDevice_p)) - { - netif_wake_queue (pNetDevice_p); - } + // $$$ d.k.: move to extra function, which is called by DLL when new space is available in TxFifo + if (netif_queue_stopped(pNetDevice_p)) { + netif_wake_queue(pNetDevice_p); + } } - - static tEplKernel VEthRecvFrame(tEplFrameInfo * pFrameInfo_p) { -tEplKernel Ret = kEplSuccessful; - struct net_device* pNetDevice = pVEthNetDevice_g; - struct net_device_stats* pStats = (struct net_device_stats*)pNetDevice->priv; - struct sk_buff *pSkb; + tEplKernel Ret = kEplSuccessful; + struct net_device *pNetDevice = pVEthNetDevice_g; + struct net_device_stats *pStats = + (struct net_device_stats *)pNetDevice->priv; + struct sk_buff *pSkb; - EPL_DBGLVL_VETH_TRACE1("VEthRecvFrame: FrameSize=%u\n", pFrameInfo_p->m_uiFrameSize); + EPL_DBGLVL_VETH_TRACE1("VEthRecvFrame: FrameSize=%u\n", + pFrameInfo_p->m_uiFrameSize); - pSkb = dev_alloc_skb(pFrameInfo_p->m_uiFrameSize + 2); - if (pSkb == NULL) - { - pStats->rx_dropped++; - goto Exit; - } - pSkb->dev = pNetDevice; + pSkb = dev_alloc_skb(pFrameInfo_p->m_uiFrameSize + 2); + if (pSkb == NULL) { + pStats->rx_dropped++; + goto Exit; + } + pSkb->dev = pNetDevice; - skb_reserve(pSkb, 2); + skb_reserve(pSkb, 2); - memcpy((void *)skb_put(pSkb, pFrameInfo_p->m_uiFrameSize), pFrameInfo_p->m_pFrame, pFrameInfo_p->m_uiFrameSize); + memcpy((void *)skb_put(pSkb, pFrameInfo_p->m_uiFrameSize), + pFrameInfo_p->m_pFrame, pFrameInfo_p->m_uiFrameSize); - pSkb->protocol = eth_type_trans(pSkb, pNetDevice); - pSkb->ip_summed = CHECKSUM_UNNECESSARY; + pSkb->protocol = eth_type_trans(pSkb, pNetDevice); + pSkb->ip_summed = CHECKSUM_UNNECESSARY; - // call netif_rx with skb - netif_rx(pSkb); + // call netif_rx with skb + netif_rx(pSkb); - EPL_DBGLVL_VETH_TRACE1("VEthRecvFrame: SrcMAC=0x%llx\n", AmiGetQword48FromBe(pFrameInfo_p->m_pFrame->m_be_abSrcMac)); + EPL_DBGLVL_VETH_TRACE1("VEthRecvFrame: SrcMAC=0x%llx\n", + AmiGetQword48FromBe(pFrameInfo_p->m_pFrame-> + m_be_abSrcMac)); - // update receive statistics - pStats->rx_packets++; - pStats->rx_bytes += pFrameInfo_p->m_uiFrameSize; + // update receive statistics + pStats->rx_packets++; + pStats->rx_bytes += pFrameInfo_p->m_uiFrameSize; -Exit: - return Ret; + Exit: + return Ret; } - tEplKernel PUBLIC VEthAddInstance(tEplDllkInitParam * pInitParam_p) { -tEplKernel Ret = kEplSuccessful; + tEplKernel Ret = kEplSuccessful; - // allocate net device structure with priv pointing to stats structure - pVEthNetDevice_g = alloc_netdev(sizeof (struct net_device_stats), EPL_VETH_NAME, ether_setup); + // allocate net device structure with priv pointing to stats structure + pVEthNetDevice_g = + alloc_netdev(sizeof(struct net_device_stats), EPL_VETH_NAME, + ether_setup); // pVEthNetDevice_g = alloc_etherdev(sizeof (struct net_device_stats)); - if (pVEthNetDevice_g == NULL) - { - Ret = kEplNoResource; - goto Exit; - } - - pVEthNetDevice_g->open = VEthOpen; - pVEthNetDevice_g->stop = VEthClose; - pVEthNetDevice_g->get_stats = VEthGetStats; - pVEthNetDevice_g->hard_start_xmit = VEthXmit; - pVEthNetDevice_g->tx_timeout = VEthTimeout; - pVEthNetDevice_g->watchdog_timeo = EPL_VETH_TX_TIMEOUT; - pVEthNetDevice_g->destructor = free_netdev; - - // copy own MAC address to net device structure - memcpy(pVEthNetDevice_g->dev_addr, pInitParam_p->m_be_abSrcMac, 6); - - //register VEth to the network subsystem - if (register_netdev(pVEthNetDevice_g)) - { - EPL_DBGLVL_VETH_TRACE0("VEthAddInstance: Could not register VEth...\n"); - } - else - { - EPL_DBGLVL_VETH_TRACE0("VEthAddInstance: Register VEth successfull...\n"); - } - -Exit: - return Ret; + if (pVEthNetDevice_g == NULL) { + Ret = kEplNoResource; + goto Exit; + } + + pVEthNetDevice_g->open = VEthOpen; + pVEthNetDevice_g->stop = VEthClose; + pVEthNetDevice_g->get_stats = VEthGetStats; + pVEthNetDevice_g->hard_start_xmit = VEthXmit; + pVEthNetDevice_g->tx_timeout = VEthTimeout; + pVEthNetDevice_g->watchdog_timeo = EPL_VETH_TX_TIMEOUT; + pVEthNetDevice_g->destructor = free_netdev; + + // copy own MAC address to net device structure + memcpy(pVEthNetDevice_g->dev_addr, pInitParam_p->m_be_abSrcMac, 6); + + //register VEth to the network subsystem + if (register_netdev(pVEthNetDevice_g)) { + EPL_DBGLVL_VETH_TRACE0 + ("VEthAddInstance: Could not register VEth...\n"); + } else { + EPL_DBGLVL_VETH_TRACE0 + ("VEthAddInstance: Register VEth successfull...\n"); + } + + Exit: + return Ret; } - tEplKernel PUBLIC VEthDelInstance(void) { -tEplKernel Ret = kEplSuccessful; - - if (pVEthNetDevice_g != NULL) - { - //unregister VEth from the network subsystem - unregister_netdev(pVEthNetDevice_g); - // destructor was set to free_netdev, - // so we do not need to call free_netdev here - pVEthNetDevice_g = NULL; - } - - return Ret; + tEplKernel Ret = kEplSuccessful; + + if (pVEthNetDevice_g != NULL) { + //unregister VEth from the network subsystem + unregister_netdev(pVEthNetDevice_g); + // destructor was set to free_netdev, + // so we do not need to call free_netdev here + pVEthNetDevice_g = NULL; + } + + return Ret; } #endif // (((EPL_MODULE_INTEGRATION) & (EPL_MODULE_VETH)) != 0) -- cgit v1.2.3