Changeset 153cc76a in mainline for uspace/srv/net/net/packet_server.c


Ignore:
Timestamp:
2011-12-23T16:42:22Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7e1b130
Parents:
4291215 (diff), 2f0dd2a (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:

Mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/net/packet_server.c

    r4291215 r153cc76a  
    304304static int packet_reply(packet_t *packet)
    305305{
     306        if (!packet_is_valid(packet))
     307                return EINVAL;
     308       
    306309        ipc_callid_t callid;
    307310        size_t size;
    308 
    309         if (!packet_is_valid(packet))
    310                 return EINVAL;
    311 
    312311        if (!async_share_in_receive(&callid, &size)) {
    313312                async_answer_0(callid, EINVAL);
    314313                return EINVAL;
    315314        }
    316 
     315       
    317316        if (size != packet->length) {
    318317                async_answer_0(callid, ENOMEM);
     
    375374        case NET_PACKET_GET:
    376375                packet = pm_find(IPC_GET_ID(*call));
    377                 if (!packet_is_valid(packet)) {
     376                if (!packet_is_valid(packet))
    378377                        return ENOENT;
    379                 }
     378               
    380379                return packet_reply(packet);
    381380       
Note: See TracChangeset for help on using the changeset viewer.