Home » Mailing list archives » git-commits-head » 2009 » July » 15

igb: gcc-3.4.6 fix

Previous thread: gre: fix ToS/DiffServ inherit bug by Linux Kernel Mailing List on Tuesday, July 14, 2009 - 6:59 pm. (1 message)

Next thread: drivers/net: using spin_lock_irqsave() in net_send_packet() by Linux Kernel Mailing List on Tuesday, July 14, 2009 - 6:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: igb: gcc-3.4.6 fix
Date: Tuesday, July 14, 2009 - 6:59 pm

Gitweb:     http://git.kernel.org/linus/c8159b2db1b49f6bda4429008c85108e2da60712
Commit:     c8159b2db1b49f6bda4429008c85108e2da60712
Parent:     41796e91a2a30fd82a0fd561022489b61f8a3188
Author:     Eric Dumazet <eric.dumazet@gmail.com>
AuthorDate: Mon Jul 13 11:11:41 2009 -0700
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Mon Jul 13 11:11:41 2009 -0700

    igb: gcc-3.4.6 fix
    
    forward declaration of inline function should be avoided, or
    old gcc cannot compile.
    
    Reported-by: Teck Choon Giam <giamteckchoon@gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/igb/igb_main.c |   77 +++++++++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index be48029..adb09d3 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -127,14 +127,48 @@ static void igb_restore_vlan(struct igb_adapter *);
 static void igb_ping_all_vfs(struct igb_adapter *);
 static void igb_msg_task(struct igb_adapter *);
 static int igb_rcv_msg_from_vf(struct igb_adapter *, u32);
-static inline void igb_set_rah_pool(struct e1000_hw *, int , int);
 static void igb_set_mc_list_pools(struct igb_adapter *, int, u16);
 static void igb_vmm_control(struct igb_adapter *);
-static inline void igb_set_vmolr(struct e1000_hw *, int);
-static inline int igb_set_vf_rlpml(struct igb_adapter *, int, int);
 static int igb_set_vf_mac(struct igb_adapter *adapter, int, unsigned char *);
 static void igb_restore_vf_multicasts(struct igb_adapter *adapter);
 
+static inline void igb_set_vmolr(struct e1000_hw *hw, int vfn)
+{
+	u32 reg_data;
+
+	reg_data = rd32(E1000_VMOLR(vfn));
+	reg_data |= E1000_VMOLR_BAM |	 /* Accept broadcast */
+	            E1000_VMOLR_ROPE |   /* Accept packets matched in UTA */
+	            E1000_VMOLR_ROMPE |  /* Accept packets matched in MTA */
+	  ...
[ message continues ]
Previous thread: gre: fix ToS/DiffServ inherit bug by Linux Kernel Mailing List on Tuesday, July 14, 2009 - 6:59 pm. (1 message)

Next thread: drivers/net: using spin_lock_irqsave() in net_send_packet() by Linux Kernel Mailing List on Tuesday, July 14, 2009 - 6:59 pm. (1 message)