fix tx rx name for kxdp

diff --git a/kneigh/kneigh.c b/kneigh/kneigh.c
index 0acf05c4a9cf4835d713e93b6d3a5de10bf40c2d..340b6557e6619f4e7b90af2d812c4f74d165d262 100644 (file)
--- a/kneigh/kneigh.c
+++ b/kneigh/kneigh.c
@@ -50,7 +50,7 @@ void kneigh_teardown_pool(struct net_device *dev){
 }    
 
 
-struct kneigh_packet *kneigh_tx_cons_buffer(struct net_device *dev){
+struct kneigh_packet *kneigh_tx_reserve_buffer(struct net_device *dev){
 
        struct kneigh_priv *priv = netdev_priv(dev);
        unsigned long flags;
@@ -370,7 +370,7 @@ void kneigh_hw_tx(char *buf, int len, struct net_device *dev){
 
        priv = netdev_priv(dest);
 
-       tx_buffer = kneigh_tx_cons_buffer(dev);
+       tx_buffer = kneigh_tx_reserve_buffer(dev);
 
        if(!tx_buffer) {
                printk(KERN_INFO "out of tx buffer, len is %i\n",len);

diff --git a/kneigh/kneigh.h b/kneigh/kneigh.h
index 60cf9fe839ac44b44fb6632f7498ef3fa7c892ce..f2ca260137d674e5886cf606be72f2dd85059755 100644 (file)
--- a/kneigh/kneigh.h
+++ b/kneigh/kneigh.h
@@ -89,7 +89,7 @@ void kneigh_setup_pool(struct net_device *dev);
 
 void kneigh_teardown_pool(struct net_device *dev);
 
-struct kneigh_packet *kneigh_tx_cons_buffer(struct net_device *dev);
+struct kneigh_packet *kneigh_tx_reserve_buffer(struct net_device *dev);
 
 void kneigh_tx_release_buffer(struct kneigh_packet *pkt);
 

diff --git a/kxdp/generic/kxdp.c b/kxdp/generic/kxdp.c
index 87871aadf89d62ba24b1b3e618c6aeed2ca86c8b..30171a7706408bda0bae876d3340aa2471b8224b 100644 (file)
--- a/kxdp/generic/kxdp.c
+++ b/kxdp/generic/kxdp.c
@@ -50,7 +50,7 @@ void kxdp_teardown_pool(struct net_device *dev){
 }    
 
 
-struct kxdp_packet *kxdp_tx_cons_buffer(struct net_device *dev){
+struct kxdp_packet *kxdp_tx_reserve_buffer(struct net_device *dev){
 
        struct kxdp_priv *priv = netdev_priv(dev);
        unsigned long flags;
@@ -318,7 +318,7 @@ void kxdp_hw_tx(char *buf, int len, struct net_device *dev){
 
        priv = netdev_priv(dest);
 
-       tx_buffer = kxdp_tx_cons_buffer(dev);
+       tx_buffer = kxdp_tx_reserve_buffer(dev);
 
        if(!tx_buffer) {
                printk(KERN_INFO "out of tx buffer, len is %i\n",len);
@@ -358,12 +358,12 @@ int kxdp_open(struct net_device *dev){
 
        if (dev == kxdp_devs[1]){
 
-        memcpy((void*)dev->dev_addr, "KNEI01", ETH_ALEN);
+        memcpy((void*)dev->dev_addr, "KXDP01", ETH_ALEN);
 
 
     } else {
 
-               memcpy((void*)dev->dev_addr, "KNEI00", ETH_ALEN);
+               memcpy((void*)dev->dev_addr, "KXDP00", ETH_ALEN);
        }
 
        struct kxdp_priv *priv = netdev_priv(dev);

diff --git a/kxdp/generic/kxdp.h b/kxdp/generic/kxdp.h
index ec42988e575c77bc985fb8bf9a5f836fe2081449..63e1112e0403e7ba8e9cf7d21e80f88b4e1fb030 100644 (file)
--- a/kxdp/generic/kxdp.h
+++ b/kxdp/generic/kxdp.h
@@ -90,7 +90,7 @@ void kxdp_setup_pool(struct net_device *dev);
 
 void kxdp_teardown_pool(struct net_device *dev);
 
-struct kxdp_packet *kxdp_tx_cons_buffer(struct net_device *dev);
+struct kxdp_packet *kxdp_tx_reserve_buffer(struct net_device *dev);
 
 void kxdp_tx_release_buffer(struct kxdp_packet *pkt);
 

diff --git a/kxdp/native/kxdp.c b/kxdp/native/kxdp.c
index fb33dc84c4a114f26bc56a9c4a2d67279b4fd5c4..a087241ecb8e01656ce8c85afee006d55ee18e9d 100644 (file)
--- a/kxdp/native/kxdp.c
+++ b/kxdp/native/kxdp.c
@@ -50,7 +50,7 @@ void kxdp_teardown_pool(struct net_device *dev){
 }    
 
 
-struct kxdp_packet *kxdp_tx_cons_buffer(struct net_device *dev){
+struct kxdp_packet *kxdp_tx_reserve_buffer(struct net_device *dev){
 
        struct kxdp_priv *priv = netdev_priv(dev);
        unsigned long flags;
@@ -367,7 +367,7 @@ void kxdp_hw_tx(char *buf, int len, struct net_device *dev){
 
        priv = netdev_priv(dest);
 
-       tx_buffer = kxdp_tx_cons_buffer(dev);
+       tx_buffer = kxdp_tx_reserve_buffer(dev);
 
        if(!tx_buffer) {
                printk(KERN_INFO "out of tx buffer, len is %i\n",len);
@@ -407,12 +407,12 @@ int kxdp_open(struct net_device *dev){
 
        if (dev == kxdp_devs[1]){
 
-        memcpy((void*)dev->dev_addr, "KNEI01", ETH_ALEN);
+        memcpy((void*)dev->dev_addr, "KXDP01", ETH_ALEN);
 
 
     } else {
 
-               memcpy((void*)dev->dev_addr, "KNEI00", ETH_ALEN);
+               memcpy((void*)dev->dev_addr, "KXDP00", ETH_ALEN);
        }
 
        struct kxdp_priv *priv = netdev_priv(dev);

diff --git a/kxdp/native/kxdp.h b/kxdp/native/kxdp.h
index 2a6ec871fcf82a30d50cebb10a8437513235a71a..484fdda75bf4fa32bce5de20dcfc3013ccae7aee 100644 (file)
--- a/kxdp/native/kxdp.h
+++ b/kxdp/native/kxdp.h
@@ -106,7 +106,7 @@ void kxdp_setup_pool(struct net_device *dev);
 
 void kxdp_teardown_pool(struct net_device *dev);
 
-struct kxdp_packet *kxdp_tx_cons_buffer(struct net_device *dev);
+struct kxdp_packet *kxdp_tx_reserve_buffer(struct net_device *dev);
 
 void kxdp_tx_release_buffer(struct kxdp_packet *pkt);