diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/sb1000.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/sb1000.c')
| -rw-r--r-- | drivers/net/sb1000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index a9ae505e1baf..66c2f1a01963 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
| @@ -961,9 +961,9 @@ sb1000_open(struct net_device *dev) | |||
| 961 | lp->rx_error_count = 0; | 961 | lp->rx_error_count = 0; |
| 962 | lp->rx_error_dpc_count = 0; | 962 | lp->rx_error_dpc_count = 0; |
| 963 | lp->rx_session_id[0] = 0x50; | 963 | lp->rx_session_id[0] = 0x50; |
| 964 | lp->rx_session_id[0] = 0x48; | 964 | lp->rx_session_id[1] = 0x48; |
| 965 | lp->rx_session_id[0] = 0x44; | 965 | lp->rx_session_id[2] = 0x44; |
| 966 | lp->rx_session_id[0] = 0x42; | 966 | lp->rx_session_id[3] = 0x42; |
| 967 | lp->rx_frame_id[0] = 0; | 967 | lp->rx_frame_id[0] = 0; |
| 968 | lp->rx_frame_id[1] = 0; | 968 | lp->rx_frame_id[1] = 0; |
| 969 | lp->rx_frame_id[2] = 0; | 969 | lp->rx_frame_id[2] = 0; |