[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  ab927f796b38ee6ed72e82681f6ee4aaaa5b8a3a (commit)
      from  040ba6f43a3cd519c8cf4c996fb6d6ed117e0a1a (commit)

Summary of changes:
 drivers/dahdi/dahdi-base.c |    1 -
 1 file changed, 1 deletion(-)


- Log -----------------------------------------------------------------
commit ab927f796b38ee6ed72e82681f6ee4aaaa5b8a3a
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Mon Jun 10 10:38:50 2013 -0500

    dahdi: Do not set rxbufpolicy when opening dahdi net device.
    
    This fixes a regression introduced in 2.7.0 in commit
    (da8b96d72575a6f819d6e465ab93700a5f9f633f "dahdi: Remove unused 'rxbufpolicy'
    and 'rxdisable' from dahdi_chan.") when CONFIG_DAHDI_NET is defined in
    include/dahdi/dahdi_config.h.
    
    rxbufpolicy was always hardcoded to immediate policy and was removed from the
    channel structure. There is no longer any need to set it in dahdi_net_open.
    
    Reported-by: Dave Fullerton <dfullertasterisk at shorelinecontainer.com>
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>
    Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index f9cc628..eff2957 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -1964,7 +1964,6 @@ static int dahdi_net_open(struct net_device *dev)
 		return -EINVAL;
 	}
 	ms->txbufpolicy = DAHDI_POLICY_IMMEDIATE;
-	ms->rxbufpolicy = DAHDI_POLICY_IMMEDIATE;
 
 	res = dahdi_reallocbufs(ms, DAHDI_DEFAULT_MTU_MRU, DAHDI_DEFAULT_NUM_BUFS);
 	if (res)

-----------------------------------------------------------------------


-- 
dahdi/linux.git