Changeset 7aaed09 in mainline for uspace/srv/net/nil/eth/eth.c


Ignore:
Timestamp:
2011-12-18T14:02:30Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c868e2d
Parents:
3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/nil/eth/eth.c

    r3b71e84d r7aaed09  
    197197        fibril_rwlock_write_lock(&eth_globals.devices_lock);
    198198        fibril_rwlock_write_lock(&eth_globals.protos_lock);
     199       
    199200        eth_globals.net_sess = sess;
    200201        memcpy(eth_globals.broadcast_addr, "\xFF\xFF\xFF\xFF\xFF\xFF",
Note: See TracChangeset for help on using the changeset viewer.